Fix a couple of connector rerouting test cases.