Updating server-side CONNECT test to improve cleanup.  Note that this triggers an error on the client side, but ignores it.