Partially revert 65bc666

* Removes accidental changes from earlier commit
Add basic server testing to ci tests