Item12888: unit test fussiness cured