Merge "Pass server to RemoteClient in API tests"