Fixing more broken tests.