Begin improve the tests to less verbose, more objective
Begin improve the tests to less verbose, more objective 2
Improve the tests - with comments
Finish layout and routes