Add unit tests and add a new feature in the file handler