Fix to some broken tests