Now all tests are passing again, including a complete roundtrip once using internal, once using TCP connections