unittest_server_refactoring
Merge pull request #162 from STerao/unittest_server_refactoring

unittest_server_refactoring