in progress
fix tests
SWC-1663: small fix Larsson noticed
Merge pull request #1199 from jay-hodgson/rpc-test

SWC-1726: Rpc test