Fixing failing rpc-encoded tests