Fixing up some more tests

Even though this should be done in here really :P