Further work on RPC, update workflow tests