Moving tests over to ScalaTest which plays nicer with Akka's TestKit