Updated worker handers & tests