bugfix rpc timing and test