Fix file_unittest.cpp
Merge branch 'dev'