Some Chapter 5 changes.
Beautify tests.
Finish layout and routes