Fix defects with routing, now works as expected from primitive testing -- test suite to come