44 files changed, 39 insertions, 127 deletions
diff --git a/cli/build.gradle b/cli/build.gradle
deleted file mode 100755
index 1450615..0000000
--- a/cli/build.gradle
+++ /dev/null
@@ -1,105 +0,0 @@
-buildscript {
-	dependencies { classpath 'net.saliman:gradle-cobertura-plugin:2.2.2' }
-	repositories { mavenCentral() }
-}
-
-evaluationDependsOn(':stringmetric-core')
-
-apply from: '../deploy.gradle'
-apply plugin: 'cobertura'
-apply plugin: 'scala'
-
-cobertura {
-	coverageFormats = ['html', 'xml']
-	coverageSourceDirs = sourceSets.main.scala.srcDirs
-}
-
-compileScala { compileScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6', '–Xdisable-assertions'] }
-compileTestScala { compileTestScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6'] }
-
-dependencies {
-	compile project(':stringmetric-core')
-	compile'org.scala-lang:scala-compiler:2.10.2'
-	compile 'org.scala-lang:scala-library:2.10.2'
-
-	testCompile project(':stringmetric-core').sourceSets.test.output
-	testCompile 'com.google.caliper:caliper:0.5-rc1'
-	testCompile 'junit:junit:4.11'
-	testCompile 'org.scalatest:scalatest_2.10:2.0.M5b'
-}
-
-sourceSets {
-	main {
-		output.resourcesDir "${project.buildDir}/classes/main"
-
-		resources { srcDir 'source/main/resource' }
-		scala { srcDir 'source/main/scala' }
-	}
-	test {
-		output.resourcesDir "${project.buildDir}/classes/test"
-
-		resources { srcDir 'source/test/resource' }
-		scala { srcDir 'source/test/scala' }
-	}
-}
-
-task tar(description: 'Assembles a compressed tar archive of source files.', dependsOn: [':stringmetric-cli:jar', ':stringmetric-core:jar']) {
-	ext.sourcePath = "${project.projectDir}/source/main/scala"
-	ext.outputPath = "${project.buildDir}"
-	ext.workingPath = "${project.buildDir}/${project.name}"
-
-	inputs.dir new File(sourcePath)
-	outputs.dir new File(outputPath, 'generated')
-	outputs.upToDateWhen { new File(workingPath).isDirectory() }
-
-	doLast {
-		// Clean up working directory and tar from last execution, should they exist.
-		ant.delete(dir: workingPath, failOnError: false)
-		ant.delete(file: "${project.buildDir}/${project.name}.tar.gz", failOnError: false)
-
-		// Create project working directory.
-		ant.mkdir(dir: workingPath)
-
-		// Create scala.sh header file.
-		ant.echo(file: "${workingPath}/scala.sh", message: '#!/bin/bash\ndir="`dirname \\"$0\\"`"\ndir="`( cd \\"$dir\\" && pwd )`"\ncp=`echo $dir/*.jar|sed \'s/ /:/g\'`\nexec scala -classpath "$cp" -savecompiled "$0" "$@"\n!#\n//')
-
-		// Copy source files to working directory.
-		ant.copy(toDir: workingPath, force: true, overwrite: true) {
-			fileset(dir: sourcePath) {
-				exclude(name: '**/cli/*.scala')
-				exclude(name: '**/package.scala')
-			}
-			filterchain {
-				concatfilter(prepend: "${workingPath}/scala.sh")
-			}
-		}
-
-		// Delete scala.sh header file.
-		ant.delete(file: "${workingPath}/scala.sh")
-
-		// Flatten and remove file extension.
-		ant.move(toDir: workingPath) {
-			fileset(dir: workingPath)
-			chainedmapper {
-				mapper(type: 'flatten')
-				mapper(from: '*.scala', to: '*', type: 'glob')
-			}
-		}
-
-		// Clean up empty folder(s) from flatten.
-		ant.delete(dir: "${workingPath}/org", includeEmptyDirs: true)
-
-		// Copy project jars into place.
-		ant.copy(toDir: workingPath, force: true, overwrite: true) {
-			fileset(dir: "${project.buildDir}/libs")
-		}
-		ant.copy(toDir: workingPath, force: true, overwrite: true) {
-			fileset(dir: "${project(':stringmetric-core').buildDir}/libs")
-		}
-
-		// Assemble compressed tar.
-		ant.tar(compression: 'gzip', destFile: "${project.buildDir}/${project.name}.tar.gz") {
-			tarfileset(dir: workingPath, fileMode: 755, prefix: project.name)
-		}
-	}
-}
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/package.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/package.scala
index 617f4a5..617f4a5 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/package.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/package.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala
index 95f14b6..95f14b6 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala
index 1249723..1249723 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala
index bef2bc5..bef2bc5 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala
index 7857c21..7857c21 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala
index 3fc9f25..3fc9f25 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala
index 2566fa8..2566fa8 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala
index 12ac8e0..12ac8e0 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala
index 370bd71..370bd71 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala
index 56cf068..56cf068 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala
index c7ec0cd..c7ec0cd 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala
index bb7ac0b..bb7ac0b 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala
index e3db059..e3db059 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala
index 8301158..8301158 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala
index cb7e188..cb7e188 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala
index 5cfcb1e..5cfcb1e 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala
index 9cfb021..9cfb021 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala
index 26914c8..26914c8 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala
index a045b49..a045b49 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala
index 08804b6..08804b6 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala
index c74f80a..c74f80a 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala
+++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/OptionMapSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/CliSpec.scala
index 8ecab11..38c6fd3 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/OptionMapSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/CliSpec.scala
@@ -1,11 +1,10 @@
 package com.rockymadden.stringmetric.cli
 
-import com.rockymadden.stringmetric.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class OptionMapSpec extends ScalaTest { "OptionMap" should provide {
+final class CliSpec extends ScalaTest { "OptionMap" should provide {
 	"apply method" when passed {
 		"single valid double dashed option" should returns {
 			"populated Map" in {
diff --git a/cli/src/test/scala/com/rockymadden/stringmetric/cli/ScalaTest.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/ScalaTest.scala
new file mode 100755
index 0000000..4cc0eed
--- /dev/null
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/ScalaTest.scala
@@ -0,0 +1,18 @@
+package com.rockymadden.stringmetric.cli
+
+import org.scalatest.{BeforeAndAfter, ParallelTestExecution, WordSpec}
+import org.scalatest.matchers.ShouldMatchers
+
+trait ScalaTest extends WordSpec with ShouldMatchers with BeforeAndAfter with ParallelTestExecution {
+	def allows = afterWord("allow")
+
+	def executes = afterWord("execute")
+
+	def passed = afterWord("passed")
+
+	def provide = afterWord("provide")
+
+	def returns = afterWord("return")
+
+	def throws = afterWord("throw")
+}
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala
index 403c50e..8b8226d 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithmSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala
index 11c84ca..ab8d4fb 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala
index 707deb4..21ae04a 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithmSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala
index 357bf6e..aa28fe4 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala
index d126b91..f2e78d9 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithmSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala
index 7f2f1b3..ce9cebd 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala
index 503f439..18d46fa 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithmSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala
index a10f1ed..041fada 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala
index 4319226..e23b3c3 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithmSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala
index c0582fa..332b058 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.phonetic
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala
index 96e6082..82cf8c2 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala
index d3304b6..dc34e8f 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala
index e684ae2..52da38f 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala
index bc07e30..866ea9e 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarometricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala
index 46ae0c6..56bf014 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala
index 7c89405..e18133c 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala
index 3a4277b..3106b02 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala
index 6e15228..0721ebe 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala
index e1d2bef..b4ae512 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala
index f0ac8be..568f583 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala
+++ b/cli/src/test/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetricSpec.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric.cli.similarity
 
-import com.rockymadden.stringmetric.ScalaTest
+import com.rockymadden.stringmetric.cli.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner