fix up failing tests