Fix tests by adjusting the worker implementation

I forgot about the boundaries to the worker's unify implementation as
well as the unit tests. Due to latest changes I had to adjust the code
to fit the newest requirements.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>