Test cleanup and adding Camel module