Add SocketController tests to expand coverage; some lines of code not reachable in test
Pull in changes from master before pushing SocketController tests