Fix broken GHUnit tests after recent changes to the save methods