Fixing up the tests