Fixed server-terminated websocket + cleaned up and re-enabled its test