CAMEL-7628: Fixed tests. Thanks to Nikolay Turpitko for the patch.