Fix and more tests for file resolver