Address code review. Fixed socket parsing tests