UnitTest pass, but some FileUtils stuff is not pretty yet