Attempt at fixing tests.