Partial revert, add server tests for CI