CLOUD-269 fixed test and removed unused logic