Fixed a few bugs in Save tests