tests passing and file names get more sanitization