FileUtils now use file only + tests