rpc updates, test1 passes