Correct tests so they pass in all the places