Fix save and edit test