Improve server config test
Improve server config test

woltemade/grant,jlabarbera11/grant,jcdenton/grant,bitinn/grant,bitinn/grant,simov/grant,fejalish/grant,woltemade/grant,jcdenton/grant,fejalish/grant