cleaning up worker, adding tests
fixing other tests...