DS-960:  Adjust tests.