Add test and fix worker options
Add retry options