reorganized the tightly-packed test/common/util.h somewhat