CAMEL-7370: Add more tests