Merge "Fixed ItmModuleTest & ItmModuleFactoryTest which were in wrong directory"