Adding the ability to bypass the input for comment when cancelling a server

Also fixing some unit test coverage