Fixing the tests