Chapter 5 - Testing Refactor
Chapter 5 - Finish layout and routes