refactor server test folder
add unit test
Merge pull request #339 from smoratinos/master

refactor server test directory