Fixed file model tests

Joseph Hurequested to merge
joseph/file-model-further-features into master

Fixed the tests in file model

Merge request reports