More tests
Fix behavior of get_file_location for Py3