Add unit tests for the chapter
Add a factory method
remove useless file