Server test1 pull to ServerTest2

ServerTest1 pull request to ServerTest2