Fix remaining broken tests