fix bug in how test determines http vs https
vbump
Upstream fix for tcp ports
Add support for multiple types of formatters