Partially revert 65bc666

* Removes accidental changes from earlier commit
Add basic server testing to ci tests
Merge pull request #197 from bastih/master

Partial revert, add server tests for CI