Change the tests
Finished layout and routes