More work on Worker tests
Worker tests finished