Reduce the complexity of CalcOperation
Adjust tests to compensate for changed protected methods.