XD-2197 updated tests to use ModuleFactory