[System] Get rid of useless catch-all clauses in SocketTest