Tidied up ScalaTest