Refactor the remaining tests