Add contact page and improve tests
Finish tests and chapter 4