CAMEL-7123 fixed the test failures