Updating to use newest dcarbone/collection-plus
Some updates to Camel and test cases
Some updates to Camel and test cases