[chore] RPC testing and fixes

No need to review. Just using this PR to deploy to Amazon for some testing. Thanks.