Gittrac #3890:  A little more cleanup of the test.