Merge "large ops test should be derived from OfficialClientTest"