Refs #7838 Fix system test to use new options.

Also remove file deletion code as we now have a save flag.
Merge branch 'feature/7838_c2e_output_options' into develop