Added tests and File utilities