Keep in mind that your not running them down to 2.5 volts, the calculator is a bit more accurate with a Li-polymer as the cut off is higher when rated for Mah 21 -22 sounds about right. While you may have set the cut off to 2.5 volts I don't think it will go to that.