test saving fixes

*saving system updates