r22351: Making progress in tests...