Fixes some broken tests