fix remaming broken tests