Fixed up more tests. Changed endpoint address build to auto put proxy same as server