CLDIDE-2106 Fixed tests