Add socket tests
Merge branch 'master' into socket_sender_issue