CLOUD-103 tests fixed