[CAMEL-6939] Fixing failing tests
Merge branch 'CAMEL-6939'