Cleanup filenames a little
Cleanup test filenames