Further attempt at fixing tests.