Make commands with %(rcpt) actually work.
Update tests to support new routes format.