*8843* Accounted for new getServerHost default arguments
Merge pull request #177 from MichaelThessel/8843_test_fixes_stable

*8843* Accounted for new getServerHost default arguments