Lots more tests- in the process discovered error with ad-hoc connections (socket id ends up being the same)