Tests changed according to filemap's interface change
Merge branch 'task4' into task5