Fixup and extend nested contextual router tests.