fix some broken tests