Code cleanup in EstimatorTest.