Update RpcDispatcherTest to be in line with 3.2.13.Final