Fix/misc

some minor misc commits. Basically this might stop OpenSwathAnalyzer_test_3 from failing since it will not share any output filenames with OpenSwathAnalyzer_test_4 any more (beforee both shared OpenSwathAnalyzer_2_swathfile.mzML.cached.tmp as an output file 308aa6c918c78bb84fde2ab0e7f50f5043ac0397)