First attempt at fixing failing tests.