diff --git a/.travis.yml b/.travis.yml
index eabe540a..68767798 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,13 +41,14 @@ addons:
 
 env:
   matrix:
-    - CONFIG=DefaultCPPConfig
+    - CONFIG=DefaultConfig
     - CONFIG=RoccExampleConfig
     - CONFIG=DmaControllerConfig
     - CONFIG=MemtestConfig
     - CONFIG=MemtestL2Config
     - CONFIG=BroadcastRegressionTestConfig
     - CONFIG=CacheRegressionTestConfig
+    - CONFIG=UnitTestConfig
 
 # blacklist private branches
 branches:
diff --git a/groundtest b/groundtest
index f411a736..8a2a1990 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit f411a7361af079e6456681edb5b94e7e0330b45b
+Subproject commit 8a2a19905f1acd48b722ea49e2d25a0e79dba782
diff --git a/junctions b/junctions
index 5138397a..aa675738 160000
--- a/junctions
+++ b/junctions
@@ -1 +1 @@
-Subproject commit 5138397ad2167a8f7c755a42d8640584620119b3
+Subproject commit aa67573876a6fdf9332dd7640439243213693d5d
diff --git a/riscv-tools b/riscv-tools
index 509c7450..1527c5ea 160000
--- a/riscv-tools
+++ b/riscv-tools
@@ -1 +1 @@
-Subproject commit 509c745061ce072e175015b9df83310a68eeb4a4
+Subproject commit 1527c5ea4a500ae142d4c8bef4d2926d9a1d45c5
diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala
index 99332ef3..a54d1a7f 100644
--- a/src/main/scala/TestConfigs.scala
+++ b/src/main/scala/TestConfigs.scala
@@ -25,8 +25,8 @@ class WithGroundTest extends Config(
         maxManagerXacts = site(NAcquireTransactors) + 2,
         dataBits = site(CacheBlockBytes)*8)
     case BuildTiles => {
-      TestGeneration.addSuite(new AssemblyUnitTestSuite)
-      TestGeneration.addSuite(new BenchmarkUnitTestSuite)
+      TestGeneration.addSuite(new AssemblyGroundTestSuite)
+      TestGeneration.addSuite(new BenchmarkGroundTestSuite)
       (0 until site(NTiles)).map { i =>
         (r: Bool, p: Parameters) =>
           Module(new GroundTestTile(i, r)
diff --git a/src/main/scala/Testing.scala b/src/main/scala/Testing.scala
index 8a0d33d0..c767c23a 100644
--- a/src/main/scala/Testing.scala
+++ b/src/main/scala/Testing.scala
@@ -29,7 +29,7 @@ run-$makeTargetName-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $$($
 """
 }
 
-trait UnitTest extends RocketTestSuite {
+trait GroundTestSuite extends RocketTestSuite {
   override def postScript = s"""
 
 $$(addprefix $$(output_dir)/, $$(addsuffix .hex, $$($makeTargetName))):
@@ -59,14 +59,14 @@ class BenchmarkTestSuite(makePrefix: String, val dir: String, val names: LinkedH
   override def toString = s"$makeTargetName = \\\n" + names.map(n => s"\t$n.riscv").mkString(" \\\n") + postScript
 }
 
-class AssemblyUnitTestSuite extends AssemblyTestSuite("","",LinkedHashSet())("") with UnitTest {
+class AssemblyGroundTestSuite extends AssemblyTestSuite("","",LinkedHashSet())("") with GroundTestSuite {
   override val dir = ""
   override val names = LinkedHashSet[String]()
   override val makeTargetName = "unit-test"
   override def toString = s"$makeTargetName = unit-test\\\n" + postScript
 }
 
-class BenchmarkUnitTestSuite extends BenchmarkTestSuite("", "", LinkedHashSet()) with UnitTest {
+class BenchmarkGroundTestSuite extends BenchmarkTestSuite("", "", LinkedHashSet()) with GroundTestSuite {
   override val makeTargetName = "unit-bmark-tests"
   override def toString = s"$makeTargetName = unit-test\\\n" + postScript
 }
diff --git a/uncore b/uncore
index 7ff3c3e1..087ed281 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 7ff3c3e1938c81f2d92ab1695e9646a4fff95f79
+Subproject commit 087ed2819207ff0abc6bcd13b0891ba87b2a8a34