Refactored tests
Finish layout and routes