more tests.
Merge branch 'master' of https://github.com/dcarbone/camel