Added more tests, added back the ability to handle files with spaces in the name.