Fixes to Broken tests