Updated FileUtils and added Unit Tests.