Add unit & func tests for RPC service-reroute