CLOUD-9 fixed tests