Refactored to always return an http.Server