Updated some broken tests