Router now uses named routes, so tests from preceding commit now pass.