More work complete on worker tests