Fixed a few naming issues in the unit tests

Stops Jenkins from exploding