Spec tweaking
Spec tweaking
Pass additional retry check args to waiting callback