reverted attempt at auto-cleanup
added empty OnWorker test