Changed test files, moved socket struct