Eng 6436 distinct reroute

You should add single- and multi-column test cases for these to the suite.