Some refactorings.  Add ScalaTest as dependency.