Merge "delete socketTag test"