Refinish layout and routes with more tests