updated the remaining tests