CAMEL-504: Refactor for camel-atom (work in progress) needs a few more unit tests to cover some of the new options