CLOUD-216 fixed a few tests