replace timeouts with iteration limits
Signed-off-by:Syed Asad Rahman <s9asad@gmail.com>