Another stab at fixing the tests.