Ajiang38740 add servers unittest

This is resubmit of the alan's pull request with requested changes. ajiang38740-add_servers_unittest (123)