worker cleanup
tweaked yet another unit test