Revert "Save and Load GSS unit tests updated Re #5965"

This reverts commit 6f9bb02f5218c02e3a2a96941f762d00977cb179.
Merge branch 'bugfix/5965_save_and_load_GSS' into develop