Add tests
Update worker
Fix delete job
Update tests
Add controller
Update tests
Merge