Add tests for server side