unit test changes for worker and tenant