Update some broken tests