bug 1089782 - fix retry limit and add test