Fixed the controller module test case to not append line-feed ("\n") at the end of the payload as having textline enabled that would cause 2 payloads going through the wire, in this case "<data><stuff/></data>" and the empty string "" afterwards. One can see the stack trace of the problem this causes while running this test on OS-X. See http://camel.apache.org/mina for more details about the "textline" and "textlineDelimiter" options. Also polished some more other stuff here & there.