fixing all the remaining tests