cleanups

3 files changed, 10 insertions, 8 deletions

diff --git a/src/test/scala/basic.scala b/src/test/scala/org/perl8/router/BasicTest.scala
index 56655e4..b00d1ae 100644
--- a/src/test/scala/basic.scala
+++ b/src/test/scala/org/perl8/router/BasicTest.scala
@@ -1,9 +1,10 @@
+package org.perl8.router
+
 import org.scalatest.FunSuite
-import router.test._
 
-import router.Router
+import org.perl8.router.test._
 
-class Basic extends FunSuite {
+class BasicTest extends FunSuite {
   val yearRx  = """\d{4}""".r
   val monthRx = """\d|10|11|12""".r
   val dayRx   = """\d|[12]\d|30|31""".r
diff --git a/src/test/scala/optional.scala b/src/test/scala/org/perl8/router/OptionalTest.scala
index ade237c..1073487 100644
--- a/src/test/scala/optional.scala
+++ b/src/test/scala/org/perl8/router/OptionalTest.scala
@@ -1,9 +1,10 @@
+package org.perl8.router
+
 import org.scalatest.FunSuite
-import router.test._
 
-import router.Router
+import org.perl8.router.test._
 
-class Optional extends FunSuite {
+class OptionalTest extends FunSuite {
   val router = new Router[Boolean]
 
   router addRoute (
diff --git a/src/test/scala/helpers.scala b/src/test/scala/org/perl8/router/test.scala
index f2f561c..e1fff79 100644
--- a/src/test/scala/helpers.scala
+++ b/src/test/scala/org/perl8/router/test.scala
@@ -1,11 +1,11 @@
-package router
+package org.perl8.router
 
 object test {
   import language.implicitConversions
 
   class RouterHelperOps[T] (router: Router[T]) {
     private def assert (condition: Boolean, msg: String) = {
-      if (condition) { None } else { Some(msg) }
+      if (condition) None else Some(msg)
     }
 
     def matches (path: String) = {