fix for bpworkers
started fixing tests