new tests for secure/protocol
protocol is set even when omitted in the host depending on the secure option
[minor] Minor style changes