fix build and scalatest code to match something a bit more modern