Enhanded socket service, refactored socket test, updated todo list