-ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")