Add Saving module to the suite and merge several improvements to other modules See merge request es/auto-s2s!19