Moved file quick file compare logic to sub-function.
Updates to tests