add changes for RPC tests