Simplify retry decorator
Add more testings, code coverage: 74%