[CAMEL-6939] Fixing failing tests