Cut down number of roundtrip tests (1 in 7)