Fix remaining tests