Further work on RPC, update workflow tests
Merge pull request #708 from rorygraves/rpc_refactor2

Further work on RPC, update workflow tests