Fix all server side test
Merge pull request #206 from smoratinos/master

Fix all server side test