fixing up more broken tests