Adding file name to save_fun and other modifications. Started adding other...

Adding file name to save_fun and other modifications. Started adding other types of checks because this expect_snapshot_file is not working well