Fixed some broken tests