PLFM-1994: code review changes, async worker, tests