Another attempt at fixing the tests