Tested WorkerModule and Edited some code

* Refactored class for being more testable
* Fixed some CS
* Tested full class
Merge branch 'master' into 2.1