Fixing the tests again