Began building record router test.
Added param default; removed unreachable code; expanded tests.
More test coverage.
More consistent ID processing; added tests.
Merge branch 'upstream'