test3 fix, but file.fileName should be fixed as well later
minor fix
merge conflict fix