Putting things back and testing