Fixed up the remaining tests