Converted tests to ScalaTest