diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpaceTimeSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpaceTimeSpec.scala
index 1595778948..b0843231a8 100644
--- a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpaceTimeSpec.scala
+++ b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpaceTimeSpec.scala
@@ -15,8 +15,8 @@ class AccumuloSpaceTimeSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestFiles
-    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests {
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec {
   implicit lazy val instance = MockAccumuloInstance()
 
   lazy val reader    = AccumuloLayerReader(instance)
diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpatialSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpatialSpec.scala
index 94f43d3206..3b0442edfc 100644
--- a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpatialSpec.scala
+++ b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloSpatialSpec.scala
@@ -12,7 +12,7 @@ class AccumuloSpatialSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
 
   implicit lazy val instance = MockAccumuloInstance()
 
diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala
index 3fc260b0f5..3e223bffcf 100644
--- a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala
+++ b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpaceTimeSpec.scala
@@ -16,8 +16,8 @@ class AccumuloTileFeatureSpaceTimeSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestTileFeatureFiles
-    with CoordinateSpaceTimeTileFeatureTests
-    with LayerUpdateSpaceTimeTileFeatureTests {
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec {
   implicit lazy val instance = MockAccumuloInstance()
 
   lazy val reader    = AccumuloLayerReader(instance)
diff --git a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpatialSpec.scala b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpatialSpec.scala
index 1d04e6ea9d..1733d09c86 100644
--- a/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpatialSpec.scala
+++ b/accumulo/src/test/scala/geotrellis/spark/io/accumulo/AccumuloTileFeatureSpatialSpec.scala
@@ -13,7 +13,7 @@ class AccumuloTileFeatureSpatialSpec
     with TestEnvironment
     with AccumuloTestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
 
   implicit lazy val instance = MockAccumuloInstance()
 
diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3SpaceTimeSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3SpaceTimeSpec.scala
index 2846da3c61..1359fc5fcc 100644
--- a/s3/src/test/scala/geotrellis/spark/io/s3/S3SpaceTimeSpec.scala
+++ b/s3/src/test/scala/geotrellis/spark/io/s3/S3SpaceTimeSpec.scala
@@ -16,8 +16,8 @@ class S3SpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec
     with BeforeAndAfterAll {
 
   registerAfterAll { () =>
diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3SpatialSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3SpatialSpec.scala
index 191e44d27f..95f39aa5fc 100644
--- a/s3/src/test/scala/geotrellis/spark/io/s3/S3SpatialSpec.scala
+++ b/s3/src/test/scala/geotrellis/spark/io/s3/S3SpatialSpec.scala
@@ -12,7 +12,7 @@ class S3SpatialSpec
   extends PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]]
     with SpatialKeyIndexMethods
     with TestEnvironment with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
 
   lazy val bucket = "mock-bucket"
   lazy val prefix = "catalog"
diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpaceTimeSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpaceTimeSpec.scala
index 07e785e458..afb033c99e 100644
--- a/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpaceTimeSpec.scala
+++ b/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpaceTimeSpec.scala
@@ -16,8 +16,8 @@ class S3TileFeatureSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with CoordinateSpaceTimeTileFeatureTests
-    with LayerUpdateSpaceTimeTileFeatureTests
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec
     with BeforeAndAfterAll {
 
   registerAfterAll { () =>
diff --git a/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpatialSpec.scala b/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpatialSpec.scala
index 455f2746f3..96df22cf09 100644
--- a/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpatialSpec.scala
+++ b/s3/src/test/scala/geotrellis/spark/io/s3/S3TileFeatureSpatialSpec.scala
@@ -14,7 +14,7 @@ class S3TileFeatureSpatialSpec
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
 
   lazy val bucket = "mock-bucket"
   lazy val prefix = "catalog"
diff --git a/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileFeatureTests.scala b/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileFeatureSpec.scala
similarity index 94%
rename from spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileFeatureTests.scala
rename to spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileFeatureSpec.scala
index e517d1c6e0..9da71c8440 100644
--- a/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileFeatureTests.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileFeatureSpec.scala
@@ -7,7 +7,7 @@ import geotrellis.spark.io.json._
 import geotrellis.vector.Extent
 
 
-trait AllOnesTestTileFeatureTests { self: PersistenceSpec[SpatialKey, TileFeature[Tile, Tile], TileLayerMetadata[SpatialKey]] =>
+trait AllOnesTestTileFeatureSpec { self: PersistenceSpec[SpatialKey, TileFeature[Tile, Tile], TileLayerMetadata[SpatialKey]] =>
 
   val bounds1 = GridBounds(1,1,3,3)
   val bounds2 = GridBounds(4,5,6,6)
diff --git a/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileTests.scala b/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileSpec.scala
similarity index 95%
rename from spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileTests.scala
rename to spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileSpec.scala
index 0b5e8ee729..d268df98e2 100644
--- a/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileTests.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/AllOnesTestTileSpec.scala
@@ -6,7 +6,8 @@ import geotrellis.spark.io.avro.codecs._
 import geotrellis.spark.io.json._
 import geotrellis.vector.Extent
 
-trait AllOnesTestTileTests { self: PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]] =>
+
+trait AllOnesTestTileSpec { self: PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]] =>
 
   val bounds1 = GridBounds(1,1,3,3)
   val bounds2 = GridBounds(4,5,6,6)
diff --git a/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTests.scala b/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeSpec.scala
similarity index 96%
rename from spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTests.scala
rename to spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeSpec.scala
index 9b3600ced0..81fafc3b76 100644
--- a/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTests.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeSpec.scala
@@ -7,7 +7,7 @@ import geotrellis.spark.io.avro.codecs._
 import geotrellis.spark.io.json._
 import org.joda.time.DateTime
 
-trait CoordinateSpaceTimeTests { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] =>
+trait CoordinateSpaceTimeSpec { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] =>
   val dates = Vector( // all the dates in the layer
     new DateTime(2010,1,1,0,0,0, DateTimeZone.UTC),
     new DateTime(2011,1,1,0,0,0, DateTimeZone.UTC),
diff --git a/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTileFeatureTests.scala b/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTileFeatureSpec.scala
similarity index 95%
rename from spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTileFeatureTests.scala
rename to spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTileFeatureSpec.scala
index 0d5966144b..6fd5f8f987 100644
--- a/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTileFeatureTests.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/CoordinateSpaceTimeTileFeatureSpec.scala
@@ -8,7 +8,7 @@ import geotrellis.spark.io.json._
 import org.joda.time.DateTime
 
 
-trait CoordinateSpaceTimeTileFeatureTests { self: PersistenceSpec[SpaceTimeKey, TileFeature[Tile, Tile], TileLayerMetadata[SpaceTimeKey]] =>
+trait CoordinateSpaceTimeTileFeatureSpec { self: PersistenceSpec[SpaceTimeKey, TileFeature[Tile, Tile], TileLayerMetadata[SpaceTimeKey]] =>
   val dates = Vector( // all the dates in the layer
     new DateTime(2010,1,1,0,0,0, DateTimeZone.UTC),
     new DateTime(2011,1,1,0,0,0, DateTimeZone.UTC),
diff --git a/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileFeatureTests.scala b/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileFeatureSpec.scala
similarity index 98%
rename from spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileFeatureTests.scala
rename to spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileFeatureSpec.scala
index 39737879db..5d6c72d897 100644
--- a/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileFeatureTests.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileFeatureSpec.scala
@@ -15,7 +15,7 @@ import geotrellis.vector._
 import org.apache.spark.rdd._
 import org.joda.time.DateTime
 
-trait LayerUpdateSpaceTimeTileFeatureTests
+trait LayerUpdateSpaceTimeTileFeatureSpec
     extends TileLayerRDDBuilders
     with TileBuilders { self: PersistenceSpec[SpaceTimeKey, TileFeature[Tile, Tile], TileLayerMetadata[SpaceTimeKey]] with TestEnvironment =>
 
diff --git a/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileTests.scala b/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileSpec.scala
similarity index 95%
rename from spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileTests.scala
rename to spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileSpec.scala
index d116abb1f7..e6c4d85ad5 100644
--- a/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileTests.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/LayerUpdateSpaceTimeTileSpec.scala
@@ -15,7 +15,9 @@ import geotrellis.vector._
 import org.apache.spark.rdd._
 import org.joda.time.DateTime
 
-trait LayerUpdateSpaceTimeTileTests extends TileLayerRDDBuilders with TileBuilders { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] with TestEnvironment =>
+trait LayerUpdateSpaceTimeTileSpec
+    extends TileLayerRDDBuilders
+    with TileBuilders { self: PersistenceSpec[SpaceTimeKey, Tile, TileLayerMetadata[SpaceTimeKey]] with TestEnvironment =>
 
   def dummyTileLayerMetadata =
     TileLayerMetadata(
diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileSpaceTimeSpec.scala
index b5a2eff622..37b5ed13d3 100644
--- a/spark/src/test/scala/geotrellis/spark/io/file/FileSpaceTimeSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/file/FileSpaceTimeSpec.scala
@@ -13,8 +13,8 @@ class FileSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestFiles
-//    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests {
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)
diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileSpatialSpec.scala
index d42bc93fbc..36f1935d80 100644
--- a/spark/src/test/scala/geotrellis/spark/io/file/FileSpatialSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/file/FileSpatialSpec.scala
@@ -6,12 +6,13 @@ import geotrellis.spark.io._
 import geotrellis.spark.io.index._
 import geotrellis.spark.testfiles.TestFiles
 
+
 class FileSpatialSpec
     extends PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]]
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)
diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpaceTimeSpec.scala
index 6162915ecf..440e827b08 100644
--- a/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpaceTimeSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpaceTimeSpec.scala
@@ -14,8 +14,8 @@ class FileTileFeatureSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-//    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileFeatureTests {
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)
diff --git a/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpatialSpec.scala
index ce60587c30..53b8d90877 100644
--- a/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpatialSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/file/FileTileFeatureSpatialSpec.scala
@@ -14,7 +14,7 @@ class FileTileFeatureSpatialSpec
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
   lazy val reader = FileLayerReader(outputLocalPath)
   lazy val writer = FileLayerWriter(outputLocalPath)
   lazy val deleter = FileLayerDeleter(outputLocalPath)
diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpaceTimeSpec.scala
index 8407c6e727..5c6a048d02 100644
--- a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpaceTimeSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpaceTimeSpec.scala
@@ -14,8 +14,8 @@ class HadoopSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with CoordinateSpaceTimeTests
-    with LayerUpdateSpaceTimeTileTests {
+    with CoordinateSpaceTimeSpec
+    with LayerUpdateSpaceTimeTileSpec {
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)
   lazy val deleter = HadoopLayerDeleter(outputLocal)
diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpatialSpec.scala
index 07f3d49795..a97b831cf0 100644
--- a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpatialSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopSpatialSpec.scala
@@ -6,12 +6,13 @@ import geotrellis.spark.io._
 import geotrellis.spark.io.index._
 import geotrellis.spark.testfiles.TestFiles
 
+
 class HadoopSpatialSpec
   extends PersistenceSpec[SpatialKey, Tile, TileLayerMetadata[SpatialKey]]
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestFiles
-    with AllOnesTestTileTests {
+    with AllOnesTestTileSpec {
 
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)
diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpaceTimeSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpaceTimeSpec.scala
index c4f8ff31fa..851fd8d1a6 100644
--- a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpaceTimeSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpaceTimeSpec.scala
@@ -15,8 +15,8 @@ class HadoopTileFeatureSpaceTimeSpec
     with SpaceTimeKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with CoordinateSpaceTimeTileFeatureTests
-    with LayerUpdateSpaceTimeTileFeatureTests {
+    with CoordinateSpaceTimeTileFeatureSpec
+    with LayerUpdateSpaceTimeTileFeatureSpec {
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)
   lazy val deleter = HadoopLayerDeleter(outputLocal)
diff --git a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpatialSpec.scala b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpatialSpec.scala
index 442042de4d..e5cdb8153f 100644
--- a/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpatialSpec.scala
+++ b/spark/src/test/scala/geotrellis/spark/io/hadoop/HadoopTileFeatureSpatialSpec.scala
@@ -12,7 +12,7 @@ class HadoopTileFeatureSpatialSpec
     with SpatialKeyIndexMethods
     with TestEnvironment
     with TestTileFeatureFiles
-    with AllOnesTestTileFeatureTests {
+    with AllOnesTestTileFeatureSpec {
 
   lazy val reader = HadoopLayerReader(outputLocal)
   lazy val writer = HadoopLayerWriter(outputLocal)