XD-2197 fix CompositeModuleTests