Correct TCG->TDB conversion; add regression tests

While working on #1932, I found that it was not possible to convert TCG to TDB, as the hop list included TDB itself.  This corrects the list, and adds regression tests.