Added test for Files utils
Fix wrong file name
Fix bugs