Merge branch 'dev-unittest_saving_files_order' into 'master'

Change saving module test to neglect the file order

See merge request es/auto-s2s!63