Added tests for specific workers, cleaning up