fix up broken tests