CFY-644 change task retries in tests
CFY-644 add test for both retry and and then success, and retry with no success