Add two more server rpc unit tests