diff --git a/build.gradle b/build.gradle
index cf5b2cfff..d32828660 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,22 +16,33 @@ sourceSets {
     }
 	test {
 		java {
-			srcDirs = ['test']
+			srcDirs = ['src', 'test']
 		}
 	}
 }
 
+test {
+	testLogging {
+		events "skipped", "failed" // just good to know in terms of what failed
+	}
+	afterSuite { TestDescriptor td, TestResult tr ->
+		println 'Tests run: ('+tr.getTestCount()+'), Failures: ('+tr.getFailedTestCount()+')' // IMPORTANT - this is required for Lightspeed
+	}
+	include 'main/TestAll.class' // to run only a single test case
+}
+
 dependencies {
 	compile fileTree(dir: 'lib', include: ['*.jar'])
+	testCompile fileTree(dir: 'lib', include: ['*.jar'])
 }
 
 buildscript {
-  repositories {
-    maven {
-      url 'https://plugins.gradle.org/m2/'
-    }
-  }
-  dependencies {
-    classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.0'
-  }
+	repositories {
+		maven {
+			url 'https://plugins.gradle.org/m2/'
+		}
+	}
+	dependencies {
+		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.0'
+	}
 }
diff --git a/lib/PSWGCommon.jar b/lib/PSWGCommon.jar
index 77879f9c8..54077f67f 100644
Binary files a/lib/PSWGCommon.jar and b/lib/PSWGCommon.jar differ