A little cleanup. Renamed an object and cleaned an import
Makin tests, makin tests pass.

Scala is teh bestest