First attempt at fixing tests.