passing all scalatest tests (long way to go still)