rpc: Remove duplicated logic, fix unittests