Moved substitutePropability to Estimator. Made some methods protected that where public wrongly.
Tried adding DiscountEstimator, but tests still fail. Have to check why.