Merge "x/ref/lib/testutil tidy up: step 1"