finished layout and routes, small test refactor