wrap makeValidFilename() calls, fix test_with_invalid_seriesname and test_with_invalid_seriesname_test2