Refactoring final large piece of worker
MOB-116: Initial refactoring for test framework is working