Now using ScalaTest for testing