Converting more tests over to only using scalatest.