Fixed FileUtils and tests