test server class and unittest testcase
Merge branch 'test-server' into integration