Fix up remaining socket tests