add; tests, coverage and failing retry test