Router: revert immediate fail behavior
test: fix style