Adding retry tests