Fixed first issue with sockets, more to go
socket tests pass