Fixing up our tests