renaming things
fixing the tests

I didn't know how to use scalatest, got it all wrong.