Improve is-server test