More unit tests, jmockit coverage, moving WorkflowFactory to different package