Second attempt at fixing tests.