Feedback and routing changes.
Add tests.

This includes a couple new UA test cases that were helpful when working
on this.