Add tests for server