round 2 - convert tests over to scalatest