feat(chapter1): rewrites
chore(*): remove refs to e2e tests
feat(chapter-2): merge chapter 2 rewrites