Refactoring packages by chapters
Add chapter's 3 tests