Refactor file identifier method
Fix scan time ordering for tests
Comments