Update test so that socket and tcp are running the tests, but not interlaced (this...