Fixing still more broken tests.