improvements to test, improvements to file_exists