Fix server name tests
Merge pull request #1411 from psav/fix_server_name_tests

Fix server name tests