diff --git a/modules/tests/TestModuleCreate.cpp b/modules/tests/TestModuleCreate.cpp
index da7f09a..2664a3d 100644
--- a/modules/tests/TestModuleCreate.cpp
+++ b/modules/tests/TestModuleCreate.cpp
@@ -55,17 +55,7 @@ protected:
   void SetUp()
   {
     std::string moduleName = CALYP_TEST_MODULE_NAME;
-
-    CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
-    CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
-    for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
-    {
-      if( strcmp( it->first, moduleName.c_str() ) == 0 )
-      {
-        pcModule = it->second();
-        break;
-      }
-    }
+    pcModule = CalypModulesFactory::Get()->CreateModule( moduleName );
   }
 
   // Called after each test
diff --git a/modules/tests/TestModuleProcessNumberOfFrames.cpp b/modules/tests/TestModuleProcessNumberOfFrames.cpp
index eb7bc16..4a9c47f 100644
--- a/modules/tests/TestModuleProcessNumberOfFrames.cpp
+++ b/modules/tests/TestModuleProcessNumberOfFrames.cpp
@@ -55,16 +55,7 @@ protected:
     pcStream->open( std::string( CALYP_TEST_DATA_DIR ) + std::string( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, ClpPixelFormats::YUV420p, 8,
                     CLP_BIG_ENDIAN, 1, CalypStream::Type::Input );
 
-    CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
-    CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
-    for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
-    {
-      if( strcmp( it->first, moduleName.c_str() ) == 0 )
-      {
-        pcModule = it->second();
-        break;
-      }
-    }
+    pcModule = CalypModulesFactory::Get()->CreateModule( moduleName );
   }
 
   void TearDown()