diff --git a/trunk/paradiseo-peo/src/peo.h b/trunk/paradiseo-peo/src/peo.h
index 9ef703a01..95bd22846 100644
--- a/trunk/paradiseo-peo/src/peo.h
+++ b/trunk/paradiseo-peo/src/peo.h
@@ -331,6 +331,7 @@
 #include "peoTransform.h"
 #include "peoEvalFunc.h"
 #include "peoPopEval.h"
+#include "peoMoeoPopEval.h"
 
 /* Cooperative island model */
 #include "core/ring_topo.h"
@@ -340,6 +341,8 @@
 #include "peoData.h"
 #include "peoSyncIslandMig.h"
 #include "peoAsyncIslandMig.h"
+#include "peoAsyncDataTransfer.h"
+#include "peoSyncDataTransfer.h"
 
 /* Synchronous multi-start model */
 #include "peoMultiStart.h"
diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index 5c9bf4e69..9ae9963d5 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -61,12 +61,12 @@ SET (TEST_LIST	  t-ParallelEval
 				  t-EAAsyncIsland
 				  t-EASyncIsland
 				  t-PSOGlobalBest
-				  t-PSOWorstPosition
-				  t-Mpdallexit)
+				  t-PSOWorstPosition)
+
 				  
 SET (TEST_STOP    t-Mpdallexit)
 	
-FOREACH (test ${TEST_LIST} ${TEST_RUN} ${TEST_STOP})
+FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
 	  SET ("T_${test}_SOURCES" "${test}.cpp")
 ENDFOREACH (test)
 
@@ -74,7 +74,7 @@ ENDFOREACH (test)
 IF(ENABLE_CMAKE_TESTING)
 	
 	# Add the tests
-	FOREACH (test ${TEST_LIST} ${TEST_RUN} ${TEST_STOP})
+	FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
 		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})  
 	ENDFOREACH (test)
 	
@@ -91,8 +91,8 @@ IF(ENABLE_CMAKE_TESTING)
 	ENDFOREACH (test)
 	
 	# Link the librairies
-	FOREACH (test ${TEST_LIST})
-	 TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo)
+	FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
+	 TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
 	ENDFOREACH (test)
 	
 ENDIF(ENABLE_CMAKE_TESTING)