Migrated unit tests
Added Builder Pattern to FileUtil