*8843* Accounted for new getServerHost default arguments
Merge pull request #176 from MichaelThessel/8843_test_fixes

*8843* Accounted for new getServerHost default arguments