Fixing the tests again, and again