Fixes to broken tests