BZ-9920: changes to save estimates file