[PATCH] diff: consolidate test helper script pieces.