Fix to invalid class references in tests

These could actually be my four build errors, although it doesn't make
sense, let's just push and see if Travis CI compiles