Gittrac #4115:  More fixes to the tests.