Fixing up more broken tests.