refactored tests
finish layout and routes