Fixed more broken tests.