Improve fileInfo() and it's test.