Fixing the tests again, and again, and again