Merge "Added tests for (re)Routing callbacks." into mnc-dev