Another shot at fixing the tests