CLOUD-332 renamed method with fixed tests