Manually backport changes in PR #36
Add 'using hostname' test per PR #36