Fixing more broken tests