Added FileUtils and some tests