Reverted change to worker argument
Fixed test to use worker class for client argument