BZ-12241: improvements to finance estimator