Tests for estimate behavior added as per review