Further refactor tests
Finish layout and routes