Refactor test somewhat to make it easier to see what it actually verifies Check some more to see why it fails sometimes in CI, e.g. on node qnode1