Updated tests to adhere to latest scalatest practices.