Patch some broken tests