From 82305b3572dac438b037ce48d9af793e56eae5ae Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Wed, 11 Mar 2009 13:25:40 +0000
Subject: [PATCH] with the recent mote type updates, the simulation config
 structure changed.

* updated simconfigs
---
 .../cooja/contiki_tests/cooja_helloworld.csc  |   73 +-
 tools/cooja/contiki_tests/crosslevel.csc      |   74 +-
 .../contiki_tests/ip_sky_telnet_ping.csc      |   20 +-
 .../contiki_tests/ip_sky_webserver_wget.csc   |   22 +-
 tools/cooja/contiki_tests/multithreading.csc  |   18 +-
 tools/cooja/contiki_tests/rime_abc.csc        |   22 +-
 tools/cooja/contiki_tests/rime_collect.csc    | 1051 ++++++++---------
 .../cooja/contiki_tests/rime_collect_sky.csc  |  686 +++++------
 tools/cooja/contiki_tests/rime_rucb.csc       |   49 +-
 tools/cooja/contiki_tests/rime_runicast.csc   |   24 +-
 tools/cooja/contiki_tests/rime_trickle.csc    |   19 +-
 .../cooja/contiki_tests/sky_checkpointing.csc |   22 +-
 tools/cooja/contiki_tests/sky_coffee.csc      |   48 +-
 tools/cooja/contiki_tests/sky_collect.csc     |   18 +-
 tools/cooja/contiki_tests/sky_deluge.csc      |  210 ++--
 tools/cooja/contiki_tests/sky_helloworld.csc  |   48 +-
 tools/cooja/contiki_tests/sky_ipv6_udp.csc    |   35 +-
 .../sky_shell_basic_commands.csc              |   18 +-
 .../cooja/contiki_tests/sky_shell_collect.csc |  668 ++++++-----
 .../sky_shell_compilation_test.csc            |  154 +--
 20 files changed, 1759 insertions(+), 1520 deletions(-)

diff --git a/tools/cooja/contiki_tests/cooja_helloworld.csc b/tools/cooja/contiki_tests/cooja_helloworld.csc
index 1216519dc..6eae7e9a7 100644
--- a/tools/cooja/contiki_tests/cooja_helloworld.csc
+++ b/tools/cooja/contiki_tests/cooja_helloworld.csc
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
-    <title>Hello World</title>
+    <title>My simulation</title>
     <delaytime>0</delaytime>
     <ticktime>1</ticktime>
     <randomseed>123456</randomseed>
-    <motedelay>0</motedelay>
+    <motedelay>1000</motedelay>
     <radiomedium>
       se.sics.cooja.radiomediums.UDGM
       <transmitting_range>50.0</transmitting_range>
@@ -15,21 +18,10 @@
     </radiomedium>
     <motetype>
       se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype2</identifier>
-      <description>Contiki Mote #1</description>
-      <contikibasedir>../../..</contikibasedir>
-      <contikicoredir>../../../platform/cooja</contikicoredir>
-      <projectdir>../../../examples/hello-world</projectdir>
-      <compilefile>../apps/mrm</compilefile>
-      <compilefile>../apps/mspsim</compilefile>
-      <compilefile>../../../examples/hello-world</compilefile>
-      <compilefile>../../../examples/hello-world</compilefile>
-      <compilefile>../../../examples/hello-world/hello-world.c</compilefile>
-      <process>hello_world_process</process>
-      <sensor>button_sensor</sensor>
-      <sensor>pir_sensor</sensor>
-      <sensor>radio_sensor</sensor>
-      <sensor>vib_sensor</sensor>
+      <identifier>mtype4</identifier>
+      <description>Contiki Mote Type #1</description>
+      <contikiapp>../../../examples/hello-world/hello-world.c</contikiapp>
+      <commands>make hello-world.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -44,28 +36,17 @@
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLog</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
-      <coreinterface>cfs_interface</coreinterface>
-      <coreinterface>beep_interface</coreinterface>
-      <coreinterface>button_interface</coreinterface>
-      <coreinterface>radio_interface</coreinterface>
-      <coreinterface>ip_interface</coreinterface>
-      <coreinterface>leds_interface</coreinterface>
-      <coreinterface>moteid_interface</coreinterface>
-      <coreinterface>pir_interface</coreinterface>
-      <coreinterface>rs232_interface</coreinterface>
-      <coreinterface>vib_interface</coreinterface>
-      <coreinterface>clock_interface</coreinterface>
-      <coreinterface>simlog_interface</coreinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
       <symbols>false</symbols>
       <commstack>Rime</commstack>
     </motetype>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype2</motetype_identifier>
+      <motetype_identifier>mtype4</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>91.48300003917207</x>
-        <y>83.5491879028037</y>
+        <x>69.64867743029201</x>
+        <y>69.2570131081022</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -78,26 +59,26 @@
       </interface_config>
       <interface_config>
         se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.15.14</ipv4address>
+        <ipv4address>10.10.4.7</ipv4address>
       </interface_config>
     </mote>
   </simulation>
   <plugin>
     se.sics.cooja.plugins.SimControl
-    <width>315</width>
+    <width>248</width>
     <z>1</z>
-    <height>199</height>
-    <location_x>13</location_x>
-    <location_y>7</location_y>
+    <height>200</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
     <minimized>false</minimized>
   </plugin>
   <plugin>
-    se.sics.cooja.plugins.VisUDGM
+    se.sics.cooja.plugins.VisState
     <width>300</width>
     <z>2</z>
-    <height>115</height>
-    <location_x>354</location_x>
-    <location_y>14</location_y>
+    <height>300</height>
+    <location_x>600</location_x>
+    <location_y>0</location_y>
     <minimized>false</minimized>
   </plugin>
   <plugin>
@@ -106,11 +87,11 @@
       <filter />
       <history>256</history>
     </plugin_config>
-    <width>573</width>
-    <z>3</z>
-    <height>200</height>
-    <location_x>379</location_x>
-    <location_y>277</location_y>
+    <width>900</width>
+    <z>0</z>
+    <height>209</height>
+    <location_x>0</location_x>
+    <location_y>591</location_y>
     <minimized>false</minimized>
   </plugin>
 </simconf>
diff --git a/tools/cooja/contiki_tests/crosslevel.csc b/tools/cooja/contiki_tests/crosslevel.csc
index f1b754393..515736fe5 100644
--- a/tools/cooja/contiki_tests/crosslevel.csc
+++ b/tools/cooja/contiki_tests/crosslevel.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,32 +21,42 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/rime/example-abc.c</source>
-      <command>make example-abc.sky TARGET=sky</command>
+      <commands>make example-abc.sky TARGET=sky</commands>
+      <firmware>../../../examples/rime/example-abc.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <motetype>
       se.sics.cooja.mspmote.ESBMoteType
       <identifier>esb1</identifier>
       <description>ESB Mote Type #1</description>
       <source>../../../examples/rime/example-abc.c</source>
-      <command>make example-abc.esb TARGET=esb</command>
+      <commands>make example-abc.esb TARGET=esb</commands>
+      <firmware>../../../examples/rime/example-abc.esb</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.ESBLog</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.ESBLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.ESBButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.TR1001Radio</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
     </motetype>
     <motetype>
       se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype9</identifier>
-      <description>Contiki Mote #1</description>
-      <contikibasedir>../../..</contikibasedir>
-      <contikicoredir>../../../platform/cooja</contikicoredir>
-      <projectdir>../../../examples/rime</projectdir>
-      <compilefile>../apps/mrm</compilefile>
-      <compilefile>../apps/mspsim</compilefile>
-      <compilefile>../../../examples/rime</compilefile>
-      <compilefile>../../../examples/rime</compilefile>
-      <compilefile>../../../examples/rime/example-abc.c</compilefile>
-      <process>example_abc_process</process>
-      <sensor>button_sensor</sensor>
-      <sensor>pir_sensor</sensor>
-      <sensor>radio_sensor</sensor>
-      <sensor>vib_sensor</sensor>
+      <identifier>mtype5</identifier>
+      <description>Contiki Mote Type #1</description>
+      <contikiapp>../../../examples/rime/example-abc.c</contikiapp>
+      <commands>make example-abc.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -58,24 +71,13 @@
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLog</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
-      <coreinterface>cfs_interface</coreinterface>
-      <coreinterface>beep_interface</coreinterface>
-      <coreinterface>button_interface</coreinterface>
-      <coreinterface>radio_interface</coreinterface>
-      <coreinterface>ip_interface</coreinterface>
-      <coreinterface>leds_interface</coreinterface>
-      <coreinterface>moteid_interface</coreinterface>
-      <coreinterface>pir_interface</coreinterface>
-      <coreinterface>rs232_interface</coreinterface>
-      <coreinterface>vib_interface</coreinterface>
-      <coreinterface>clock_interface</coreinterface>
-      <coreinterface>simlog_interface</coreinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
       <symbols>false</symbols>
       <commstack>Rime</commstack>
     </motetype>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype9</motetype_identifier>
+      <motetype_identifier>mtype5</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>-562.9265350779835</x>
@@ -97,7 +99,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype9</motetype_identifier>
+      <motetype_identifier>mtype5</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>-569.1395123422226</x>
@@ -175,7 +177,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype9</motetype_identifier>
+      <motetype_identifier>mtype5</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>981.0053840033577</x>
@@ -197,7 +199,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype9</motetype_identifier>
+      <motetype_identifier>mtype5</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>1346.8489601454312</x>
@@ -249,7 +251,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>265</width>
-    <z>1</z>
+    <z>2</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -258,7 +260,7 @@
   <plugin>
     se.sics.cooja.plugins.VisState
     <width>884</width>
-    <z>2</z>
+    <z>1</z>
     <height>211</height>
     <location_x>277</location_x>
     <location_y>0</location_y>
@@ -271,7 +273,7 @@
       <history>256</history>
     </plugin_config>
     <width>1161</width>
-    <z>4</z>
+    <z>0</z>
     <height>370</height>
     <location_x>0</location_x>
     <location_y>458</location_y>
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc b/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
index 76f8d4d0b..aa4f5345b 100644
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
+++ b/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky-ip/sky-telnet-server.c</source>
-      <command>make sky-telnet-server.sky TARGET=sky</command>
+      <commands>make sky-telnet-server.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky-ip/sky-telnet-server.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -42,7 +56,7 @@
       <history>256</history>
     </plugin_config>
     <width>1024</width>
-    <z>3</z>
+    <z>1</z>
     <height>209</height>
     <location_x>0</location_x>
     <location_y>446</location_y>
@@ -65,7 +79,7 @@
       <register_routes>true</register_routes>
     </plugin_config>
     <width>388</width>
-    <z>1</z>
+    <z>0</z>
     <height>331</height>
     <location_x>265</location_x>
     <location_y>16</location_y>
diff --git a/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc b/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
index 8a046a1ca..3355a3a5e 100644
--- a/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
+++ b/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky-shell-webserver/sky-shell-webserver.c</source>
-      <command>make sky-shell-webserver.sky TARGET=sky</command>
+      <commands>make sky-shell-webserver.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky-shell-webserver/sky-shell-webserver.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -80,7 +94,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>248</width>
-    <z>1</z>
+    <z>2</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -89,7 +103,7 @@
   <plugin>
     se.sics.cooja.plugins.VisUDGM
     <width>435</width>
-    <z>4</z>
+    <z>0</z>
     <height>195</height>
     <location_x>255</location_x>
     <location_y>6</location_y>
@@ -115,7 +129,7 @@
       <interface>Serial port</interface>
     </plugin_config>
     <width>682</width>
-    <z>2</z>
+    <z>1</z>
     <height>334</height>
     <location_x>10</location_x>
     <location_y>207</location_y>
diff --git a/tools/cooja/contiki_tests/multithreading.csc b/tools/cooja/contiki_tests/multithreading.csc
index 009204ed1..323dab7d2 100644
--- a/tools/cooja/contiki_tests/multithreading.csc
+++ b/tools/cooja/contiki_tests/multithreading.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/multi-threading/multi-threading.c</source>
-      <command>make multi-threading.sky TARGET=sky</command>
+      <commands>make multi-threading.sky TARGET=sky</commands>
+      <firmware>../../../examples/multi-threading/multi-threading.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -47,7 +61,7 @@
   <plugin>
     se.sics.cooja.plugins.VisState
     <width>300</width>
-    <z>3</z>
+    <z>0</z>
     <height>300</height>
     <location_x>638</location_x>
     <location_y>0</location_y>
diff --git a/tools/cooja/contiki_tests/rime_abc.csc b/tools/cooja/contiki_tests/rime_abc.csc
index 041635f25..b3f8027e8 100644
--- a/tools/cooja/contiki_tests/rime_abc.csc
+++ b/tools/cooja/contiki_tests/rime_abc.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/rime/example-abc.c</source>
-      <command>make example-abc.sky TARGET=sky</command>
+      <commands>make example-abc.sky TARGET=sky</commands>
+      <firmware>../../../examples/rime/example-abc.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -52,7 +66,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>313</width>
-    <z>1</z>
+    <z>2</z>
     <height>199</height>
     <location_x>30</location_x>
     <location_y>30</location_y>
@@ -61,7 +75,7 @@
   <plugin>
     se.sics.cooja.plugins.VisUDGM
     <width>300</width>
-    <z>2</z>
+    <z>1</z>
     <height>122</height>
     <location_x>367</location_x>
     <location_y>23</location_y>
@@ -74,7 +88,7 @@
       <history>256</history>
     </plugin_config>
     <width>573</width>
-    <z>3</z>
+    <z>0</z>
     <height>242</height>
     <location_x>23</location_x>
     <location_y>235</location_y>
diff --git a/tools/cooja/contiki_tests/rime_collect.csc b/tools/cooja/contiki_tests/rime_collect.csc
index effa723fd..3f89033c5 100644
--- a/tools/cooja/contiki_tests/rime_collect.csc
+++ b/tools/cooja/contiki_tests/rime_collect.csc
@@ -1,535 +1,516 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>Rime collect test</title>
-    <delaytime>0</delaytime>
-    <ticktime>1</ticktime>
-    <randomseed>123456</randomseed>
-    <motedelay>1000</motedelay>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype7</identifier>
-      <description>Contiki Mote #1</description>
-      <contikibasedir>../../..</contikibasedir>
-      <contikicoredir>../../../platform/cooja</contikicoredir>
-      <projectdir>../../../examples/rime</projectdir>
-      <compilefile>../apps/mrm</compilefile>
-      <compilefile>../apps/mspsim</compilefile>
-      <compilefile>../../../examples/rime</compilefile>
-      <compilefile>../../../examples/rime</compilefile>
-      <compilefile>../../../examples/rime/example-collect.c</compilefile>
-      <process>example_collect_process</process>
-      <sensor>pir_sensor</sensor>
-      <sensor>vib_sensor</sensor>
-      <sensor>button_sensor</sensor>
-      <sensor>radio_sensor</sensor>
-      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLog</moteinterface>
-      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
-      <coreinterface>cfs_interface</coreinterface>
-      <coreinterface>pir_interface</coreinterface>
-      <coreinterface>radio_interface</coreinterface>
-      <coreinterface>vib_interface</coreinterface>
-      <coreinterface>rs232_interface</coreinterface>
-      <coreinterface>button_interface</coreinterface>
-      <coreinterface>beep_interface</coreinterface>
-      <coreinterface>leds_interface</coreinterface>
-      <coreinterface>moteid_interface</coreinterface>
-      <coreinterface>ip_interface</coreinterface>
-      <coreinterface>clock_interface</coreinterface>
-      <coreinterface>simlog_interface</coreinterface>
-      <symbols>false</symbols>
-      <commstack>Rime</commstack>
-    </motetype>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>50.829139451170256</x>
-        <y>62.671405251575884</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>1</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.9.16</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>66.70779372167401</x>
-        <y>87.6357288540325</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>2</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.10.16</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>41.129223698257974</x>
-        <y>11.860747327849797</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>3</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.16.4</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>3.896453344832884</x>
-        <y>57.94647173289612</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>4</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.17.2</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>66.34456950462831</x>
-        <y>23.965576279871247</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>5</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.8.8</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>70.88189625059834</x>
-        <y>87.6624950776213</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>6</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.16.12</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>19.09803704982651</x>
-        <y>38.15109163392978</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>7</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.8.4</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>89.63745297998314</x>
-        <y>5.041038966356015</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>8</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.3.6</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>13.348832186584092</x>
-        <y>21.93390094486253</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>9</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.15.15</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>1.674784139064478</x>
-        <y>14.130140721379835</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>10</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.4.19</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>47.87142051729898</x>
-        <y>7.506518941902218</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>11</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.5.7</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>26.88271893793631</x>
-        <y>45.005087461409865</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>12</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.17.17</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>56.02971812708909</x>
-        <y>26.88551057316878</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>13</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.13.11</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>95.69470045280002</x>
-        <y>71.59310205157577</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>14</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.14.17</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>31.731698652367335</x>
-        <y>39.71639147226488</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>15</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.16.19</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>2.8792353689463424</x>
-        <y>51.72896355140204</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>16</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.2.4</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>51.07177717821779</x>
-        <y>90.91445330727116</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>17</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.8.9</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>43.42318694224158</x>
-        <y>91.44323457482095</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>18</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.16.4</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>87.22205782780289</x>
-        <y>48.33830904569607</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>19</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.6.15</ipv4address>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype7</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>1.6332448872152683</x>
-        <y>32.64258506789177</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.interfaces.Battery
-        <infinite>false</infinite>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>20</id>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
-        <ipv4address>10.10.18.5</ipv4address>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>223</width>
-    <z>4</z>
-    <height>227</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.VisState
-    <width>300</width>
-    <z>3</z>
-    <height>300</height>
-    <location_x>723</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <history>256</history>
-    </plugin_config>
-    <width>1023</width>
-    <z>2</z>
-    <height>207</height>
-    <location_x>0</location_x>
-    <location_y>461</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
+  <simulation>
+    <title>Rime collect test</title>
+    <delaytime>0</delaytime>
+    <ticktime>1</ticktime>
+    <randomseed>123456</randomseed>
+    <motedelay>1000</motedelay>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <motetype>
+      se.sics.cooja.contikimote.ContikiMoteType
+      <identifier>mtype1</identifier>
+      <description>Contiki Mote Type #1</description>
+      <contikiapp>../../../examples/rime/example-collect.c</contikiapp>
+      <commands>make example-collect.cooja TARGET=cooja</commands>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLog</moteinterface>
+      <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <symbols>false</symbols>
+      <commstack>Rime</commstack>
+    </motetype>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>50.829139451170256</x>
+        <y>62.671405251575884</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.9.16</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>66.70779372167401</x>
+        <y>87.6357288540325</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.10.16</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>41.129223698257974</x>
+        <y>11.860747327849797</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.16.4</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>3.896453344832884</x>
+        <y>57.94647173289612</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.17.2</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>66.34456950462831</x>
+        <y>23.965576279871247</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.8.8</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>70.88189625059834</x>
+        <y>87.6624950776213</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.16.12</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>19.09803704982651</x>
+        <y>38.15109163392978</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.8.4</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>89.63745297998314</x>
+        <y>5.041038966356015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.3.6</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>13.348832186584092</x>
+        <y>21.93390094486253</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>9</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.15.15</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>1.674784139064478</x>
+        <y>14.130140721379835</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>10</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.4.19</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>47.87142051729898</x>
+        <y>7.506518941902218</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>11</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.5.7</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>26.88271893793631</x>
+        <y>45.005087461409865</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>12</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.17.17</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>56.02971812708909</x>
+        <y>26.88551057316878</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>13</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.13.11</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>95.69470045280002</x>
+        <y>71.59310205157577</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>14</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.14.17</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>31.731698652367335</x>
+        <y>39.71639147226488</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>15</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.16.19</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>2.8792353689463424</x>
+        <y>51.72896355140204</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>16</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.2.4</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>51.07177717821779</x>
+        <y>90.91445330727116</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>17</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.8.9</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>43.42318694224158</x>
+        <y>91.44323457482095</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>18</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.16.4</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>87.22205782780289</x>
+        <y>48.33830904569607</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>19</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.6.15</ipv4address>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <motetype_identifier>mtype1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>1.6332448872152683</x>
+        <y>32.64258506789177</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Battery
+        <infinite>false</infinite>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>20</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiIPAddress
+        <ipv4address>10.10.18.5</ipv4address>
+      </interface_config>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>223</width>
+    <z>1</z>
+    <height>227</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.VisState
+    <width>300</width>
+    <z>0</z>
+    <height>300</height>
+    <location_x>723</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <history>256</history>
+    </plugin_config>
+    <width>1023</width>
+    <z>2</z>
+    <height>207</height>
+    <location_x>0</location_x>
+    <location_y>461</location_y>
+    <minimized>false</minimized>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/rime_collect_sky.csc b/tools/cooja/contiki_tests/rime_collect_sky.csc
index b9db69f0f..9983d2ef8 100644
--- a/tools/cooja/contiki_tests/rime_collect_sky.csc
+++ b/tools/cooja/contiki_tests/rime_collect_sky.csc
@@ -1,336 +1,350 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <ticktime>1</ticktime>
-    <randomseed>123456</randomseed>
-    <motedelay>1000</motedelay>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source>../../../examples/rime/example-collect.c</source>
-      <command>make example-collect.sky TARGET=sky</command>
-    </motetype>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>87.29845932913939</x>
-        <y>60.286214311723164</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>94.30809966340686</x>
-        <y>22.50388779326399</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>2</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>82.40423567500785</x>
-        <y>39.56979106929553</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>3</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>26.185019854469438</x>
-        <y>4.800834369523899</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>4</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>1.9530156130507015</x>
-        <y>78.3175061800706</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>5</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>48.35216700543414</x>
-        <y>80.36988713780997</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>6</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>24.825985087266833</x>
-        <y>74.27809432062487</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>7</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>8.356165164293616</x>
-        <y>94.33967355724187</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>8</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>45.11740613004886</x>
-        <y>31.7059041432301</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>9</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>68.9908548386292</x>
-        <y>55.01991960639596</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>10</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>13.181122543889046</x>
-        <y>55.9636533130127</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>11</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>2.1749985906538427</x>
-        <y>78.39666095789707</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>12</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>37.79795217518357</x>
-        <y>7.164284163506062</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>13</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>64.4595177394984</x>
-        <y>72.115414337433</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>14</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>81.85663737096085</x>
-        <y>89.31412706434035</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>15</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>44.74952276297882</x>
-        <y>18.78566116347574</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>16</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>96.11333426285873</x>
-        <y>90.64560410751824</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>17</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>21.651464136783527</x>
-        <y>7.1381043251259495</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>18</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>83.6006916200628</x>
-        <y>26.97170140682981</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>19</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>1.3446070721664705</x>
-        <y>7.340373220385176</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>20</id>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>223</width>
-    <z>4</z>
-    <height>227</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.VisState
-    <width>300</width>
-    <z>3</z>
-    <height>300</height>
-    <location_x>390</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <history>256</history>
-    </plugin_config>
-    <width>690</width>
-    <z>2</z>
-    <height>207</height>
-    <location_x>0</location_x>
-    <location_y>439</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
+  <simulation>
+    <title>My simulation</title>
+    <delaytime>0</delaytime>
+    <ticktime>1</ticktime>
+    <randomseed>123456</randomseed>
+    <motedelay>1000</motedelay>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source>../../../examples/rime/example-collect.c</source>
+      <commands>make example-collect.sky TARGET=sky</commands>
+      <firmware>../../../examples/rime/example-collect.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>87.29845932913939</x>
+        <y>60.286214311723164</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>94.30809966340686</x>
+        <y>22.50388779326399</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>82.40423567500785</x>
+        <y>39.56979106929553</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>26.185019854469438</x>
+        <y>4.800834369523899</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>4</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>1.9530156130507015</x>
+        <y>78.3175061800706</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>5</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>48.35216700543414</x>
+        <y>80.36988713780997</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>6</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>24.825985087266833</x>
+        <y>74.27809432062487</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>7</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>8.356165164293616</x>
+        <y>94.33967355724187</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>8</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>45.11740613004886</x>
+        <y>31.7059041432301</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>9</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>68.9908548386292</x>
+        <y>55.01991960639596</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>10</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>13.181122543889046</x>
+        <y>55.9636533130127</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>11</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>2.1749985906538427</x>
+        <y>78.39666095789707</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>12</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>37.79795217518357</x>
+        <y>7.164284163506062</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>13</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>64.4595177394984</x>
+        <y>72.115414337433</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>14</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>81.85663737096085</x>
+        <y>89.31412706434035</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>15</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>44.74952276297882</x>
+        <y>18.78566116347574</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>16</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>96.11333426285873</x>
+        <y>90.64560410751824</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>17</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>21.651464136783527</x>
+        <y>7.1381043251259495</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>18</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>83.6006916200628</x>
+        <y>26.97170140682981</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>19</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>1.3446070721664705</x>
+        <y>7.340373220385176</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>20</id>
+      </interface_config>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>223</width>
+    <z>1</z>
+    <height>227</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.VisState
+    <width>300</width>
+    <z>0</z>
+    <height>300</height>
+    <location_x>390</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <history>256</history>
+    </plugin_config>
+    <width>690</width>
+    <z>2</z>
+    <height>207</height>
+    <location_x>0</location_x>
+    <location_y>439</location_y>
+    <minimized>false</minimized>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/rime_rucb.csc b/tools/cooja/contiki_tests/rime_rucb.csc
index 7aeb753b2..a4e02374f 100644
--- a/tools/cooja/contiki_tests/rime_rucb.csc
+++ b/tools/cooja/contiki_tests/rime_rucb.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -15,21 +18,10 @@
     </radiomedium>
     <motetype>
       se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype16</identifier>
+      <identifier>mtype1</identifier>
       <description>Contiki Mote #1</description>
-      <contikibasedir>../../..</contikibasedir>
-      <contikicoredir>../../../platform/cooja</contikicoredir>
-      <projectdir>../../../examples/rime</projectdir>
-      <compilefile>../apps/mrm</compilefile>
-      <compilefile>../apps/mspsim</compilefile>
-      <compilefile>../../../examples/rime</compilefile>
-      <compilefile>../../../examples/rime</compilefile>
-      <compilefile>../../../examples/rime/example-rucb.c</compilefile>
-      <process>example_rucb_process</process>
-      <sensor>button_sensor</sensor>
-      <sensor>pir_sensor</sensor>
-      <sensor>radio_sensor</sensor>
-      <sensor>vib_sensor</sensor>
+      <contikiapp>../../../examples/rime/example-rucb.c</contikiapp>
+      <commands>make example-rucb.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -44,24 +36,13 @@
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLog</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
-      <coreinterface>cfs_interface</coreinterface>
-      <coreinterface>beep_interface</coreinterface>
-      <coreinterface>button_interface</coreinterface>
-      <coreinterface>radio_interface</coreinterface>
-      <coreinterface>ip_interface</coreinterface>
-      <coreinterface>leds_interface</coreinterface>
-      <coreinterface>moteid_interface</coreinterface>
-      <coreinterface>pir_interface</coreinterface>
-      <coreinterface>rs232_interface</coreinterface>
-      <coreinterface>vib_interface</coreinterface>
-      <coreinterface>clock_interface</coreinterface>
-      <coreinterface>simlog_interface</coreinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
       <symbols>false</symbols>
       <commstack>Rime</commstack>
     </motetype>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype16</motetype_identifier>
+      <motetype_identifier>mtype1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>0.0</x>
@@ -83,7 +64,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype16</motetype_identifier>
+      <motetype_identifier>mtype1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>14.102564102564104</x>
@@ -105,7 +86,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype16</motetype_identifier>
+      <motetype_identifier>mtype1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>-32.16814655285737</x>
@@ -127,7 +108,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype16</motetype_identifier>
+      <motetype_identifier>mtype1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>-1.5917258339289355</x>
@@ -149,7 +130,7 @@
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype16</motetype_identifier>
+      <motetype_identifier>mtype1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>26.334899854939632</x>
@@ -186,7 +167,7 @@
       <history>256</history>
     </plugin_config>
     <width>692</width>
-    <z>4</z>
+    <z>2</z>
     <height>209</height>
     <location_x>0</location_x>
     <location_y>434</location_y>
@@ -195,7 +176,7 @@
   <plugin>
     se.sics.cooja.plugins.VisUDGM
     <width>216</width>
-    <z>2</z>
+    <z>4</z>
     <height>197</height>
     <location_x>477</location_x>
     <location_y>0</location_y>
@@ -204,7 +185,7 @@
   <plugin>
     se.sics.cooja.plugins.VisTraffic
     <width>208</width>
-    <z>5</z>
+    <z>0</z>
     <height>203</height>
     <location_x>266</location_x>
     <location_y>-2</location_y>
diff --git a/tools/cooja/contiki_tests/rime_runicast.csc b/tools/cooja/contiki_tests/rime_runicast.csc
index 0fc873a2a..3c36b5ca8 100644
--- a/tools/cooja/contiki_tests/rime_runicast.csc
+++ b/tools/cooja/contiki_tests/rime_runicast.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/rime/example-runicast.c</source>
-      <command>make example-runicast.sky TARGET=sky</command>
+      <commands>make example-runicast.sky TARGET=sky</commands>
+      <firmware>../../../examples/rime/example-runicast.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -80,7 +94,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>265</width>
-    <z>1</z>
+    <z>3</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -102,7 +116,7 @@
   <plugin>
     se.sics.cooja.plugins.VisUDGM
     <width>263</width>
-    <z>4</z>
+    <z>1</z>
     <height>125</height>
     <location_x>1</location_x>
     <location_y>200</location_y>
@@ -111,7 +125,7 @@
   <plugin>
     se.sics.cooja.plugins.RadioLogger
     <width>427</width>
-    <z>3</z>
+    <z>4</z>
     <height>432</height>
     <location_x>264</location_x>
     <location_y>1</location_y>
@@ -120,7 +134,7 @@
   <plugin>
     se.sics.cooja.plugins.VisTraffic
     <width>263</width>
-    <z>5</z>
+    <z>0</z>
     <height>110</height>
     <location_x>1</location_x>
     <location_y>324</location_y>
diff --git a/tools/cooja/contiki_tests/rime_trickle.csc b/tools/cooja/contiki_tests/rime_trickle.csc
index d366b9f60..2325e026b 100644
--- a/tools/cooja/contiki_tests/rime_trickle.csc
+++ b/tools/cooja/contiki_tests/rime_trickle.csc
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
     <ticktime>1</ticktime>
     <randomseed>123456</randomseed>
-    <nrticklists>1</nrticklists>
     <motedelay>1000</motedelay>
     <radiomedium>
       se.sics.cooja.radiomediums.UDGM
@@ -19,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/rime/example-trickle.c</source>
-      <command>make example-trickle.sky TARGET=sky</command>
+      <commands>make example-trickle.sky TARGET=sky</commands>
+      <firmware>../../../examples/rime/example-trickle.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -174,7 +187,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>313</width>
-    <z>3</z>
+    <z>0</z>
     <height>199</height>
     <location_x>14</location_x>
     <location_y>5</location_y>
diff --git a/tools/cooja/contiki_tests/sky_checkpointing.csc b/tools/cooja/contiki_tests/sky_checkpointing.csc
index 8e496e02e..8e7dd383f 100644
--- a/tools/cooja/contiki_tests/sky_checkpointing.csc
+++ b/tools/cooja/contiki_tests/sky_checkpointing.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky-shell/sky-checkpoint.c</source>
-      <command>make sky-checkpoint.sky TARGET=sky</command>
+      <commands>make sky-checkpoint.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky-shell/sky-checkpoint.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -38,7 +52,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>248</width>
-    <z>2</z>
+    <z>3</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -47,7 +61,7 @@
   <plugin>
     se.sics.cooja.plugins.VisState
     <width>300</width>
-    <z>3</z>
+    <z>2</z>
     <height>300</height>
     <location_x>724</location_x>
     <location_y>0</location_y>
@@ -60,7 +74,7 @@
       <history>256</history>
     </plugin_config>
     <width>1024</width>
-    <z>4</z>
+    <z>0</z>
     <height>209</height>
     <location_x>0</location_x>
     <location_y>446</location_y>
diff --git a/tools/cooja/contiki_tests/sky_coffee.csc b/tools/cooja/contiki_tests/sky_coffee.csc
index 31337d611..3eededfbd 100644
--- a/tools/cooja/contiki_tests/sky_coffee.csc
+++ b/tools/cooja/contiki_tests/sky_coffee.csc
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>test</title>
     <delaytime>0</delaytime>
     <ticktime>1</ticktime>
     <randomseed>123456</randomseed>
-    <nrticklists>1</nrticklists>
     <motedelay>0</motedelay>
     <radiomedium>
       se.sics.cooja.radiomediums.UDGM
@@ -19,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky/test-coffee.c</source>
-      <command>make test-coffee.sky TARGET=sky</command>
+      <commands>make test-coffee.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky/test-coffee.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -36,5 +49,36 @@
       </interface_config>
     </mote>
   </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>248</width>
+    <z>2</z>
+    <height>200</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.VisState
+    <width>300</width>
+    <z>1</z>
+    <height>300</height>
+    <location_x>1239</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <history>256</history>
+    </plugin_config>
+    <width>1539</width>
+    <z>0</z>
+    <height>209</height>
+    <location_x>0</location_x>
+    <location_y>945</location_y>
+    <minimized>false</minimized>
+  </plugin>
 </simconf>
 
diff --git a/tools/cooja/contiki_tests/sky_collect.csc b/tools/cooja/contiki_tests/sky_collect.csc
index 535f9c4b7..857f977dc 100644
--- a/tools/cooja/contiki_tests/sky_collect.csc
+++ b/tools/cooja/contiki_tests/sky_collect.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky/sky-collect.c</source>
-      <command>make sky-collect.sky TARGET=sky</command>
+      <commands>make sky-collect.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky/sky-collect.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -135,7 +149,7 @@
       <history>256</history>
     </plugin_config>
     <width>1168</width>
-    <z>4</z>
+    <z>0</z>
     <height>240</height>
     <location_x>-1</location_x>
     <location_y>618</location_y>
diff --git a/tools/cooja/contiki_tests/sky_deluge.csc b/tools/cooja/contiki_tests/sky_deluge.csc
index 86e537f0e..3d4aad31f 100644
--- a/tools/cooja/contiki_tests/sky_deluge.csc
+++ b/tools/cooja/contiki_tests/sky_deluge.csc
@@ -1,98 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>Deluge</title>
-    <delaytime>0</delaytime>
-    <ticktime>1</ticktime>
-    <randomseed>123456</randomseed>
-    <motedelay>1000</motedelay>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky/test-deluge.c</source>
-      <command>make APPS=deluge test-deluge.sky TARGET=sky</command>
-    </motetype>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>22.464792491653174</x>
-        <y>11.3235347656354</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>16.167564578306468</x>
-        <y>29.89745599030348</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>3</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>63.42409596590043</x>
-        <y>12.470791515046386</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>5</id>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>282</width>
-    <z>2</z>
-    <height>187</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.VisState
-    <width>300</width>
-    <z>3</z>
-    <height>300</height>
-    <location_x>390</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter>version</filter>
-      <history>256</history>
-    </plugin_config>
-    <width>690</width>
-    <z>1</z>
-    <height>328</height>
-    <location_x>0</location_x>
-    <location_y>319</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
+  <simulation>
+    <title>Deluge</title>
+    <delaytime>0</delaytime>
+    <ticktime>1</ticktime>
+    <randomseed>123456</randomseed>
+    <motedelay>1000</motedelay>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source>../../../examples/sky/test-deluge.c</source>
+      <commands>make APPS=deluge test-deluge.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky/test-deluge.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>22.464792491653174</x>
+        <y>11.3235347656354</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>16.167564578306468</x>
+        <y>29.89745599030348</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>63.42409596590043</x>
+        <y>12.470791515046386</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>5</id>
+      </interface_config>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>282</width>
+    <z>2</z>
+    <height>187</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.VisState
+    <width>300</width>
+    <z>0</z>
+    <height>300</height>
+    <location_x>390</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter>version</filter>
+      <history>256</history>
+    </plugin_config>
+    <width>690</width>
+    <z>1</z>
+    <height>328</height>
+    <location_x>0</location_x>
+    <location_y>319</location_y>
+    <minimized>false</minimized>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/sky_helloworld.csc b/tools/cooja/contiki_tests/sky_helloworld.csc
index 1a9625f04..f7183f642 100644
--- a/tools/cooja/contiki_tests/sky_helloworld.csc
+++ b/tools/cooja/contiki_tests/sky_helloworld.csc
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>Hello World (Sky)</title>
     <delaytime>0</delaytime>
     <ticktime>1</ticktime>
     <randomseed>123456</randomseed>
-    <nrticklists>1</nrticklists>
     <motedelay>0</motedelay>
     <radiomedium>
       se.sics.cooja.radiomediums.UDGM
@@ -19,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/hello-world/hello-world.c</source>
-      <command>make hello-world.sky TARGET=sky</command>
+      <commands>make hello-world.sky TARGET=sky</commands>
+      <firmware>../../../examples/hello-world/hello-world.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -36,5 +49,36 @@
       </interface_config>
     </mote>
   </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>248</width>
+    <z>2</z>
+    <height>200</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.VisState
+    <width>300</width>
+    <z>1</z>
+    <height>300</height>
+    <location_x>1239</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <history>256</history>
+    </plugin_config>
+    <width>1539</width>
+    <z>0</z>
+    <height>209</height>
+    <location_x>0</location_x>
+    <location_y>945</location_y>
+    <minimized>false</minimized>
+  </plugin>
 </simconf>
 
diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp.csc b/tools/cooja/contiki_tests/sky_ipv6_udp.csc
index b24b69993..5175ba1f8 100644
--- a/tools/cooja/contiki_tests/sky_ipv6_udp.csc
+++ b/tools/cooja/contiki_tests/sky_ipv6_udp.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,14 +21,36 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/udp-sender-ipv6/example-udp-sender.c</source>
-      <command>make example-udp-sender.sky TARGET=sky DEFINES=WITH_UIP6,WITH_NULLMAC,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7502,UDP_ADDR_G=0x02,UDP_ADDR_H=0x202</command>
+      <commands>make example-udp-sender.sky TARGET=sky DEFINES=WITH_UIP6,WITH_NULLMAC,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7502,UDP_ADDR_G=0x02,UDP_ADDR_H=0x202</commands>
+      <firmware>../../../examples/udp-sender-ipv6/example-udp-sender.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <motetype>
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky2</identifier>
       <description>Sky Mote Type #2</description>
       <source>../../../examples/udp-receiver-ipv6/example-udp-receiver.c</source>
-      <command>make example-udp-receiver.sky TARGET=sky DEFINES=WITH_UIP6,WITH_NULLMAC,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7501,UDP_ADDR_G=0x01,UDP_ADDR_H=0x101</command>
+      <commands>make example-udp-receiver.sky TARGET=sky DEFINES=WITH_UIP6,WITH_NULLMAC,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7501,UDP_ADDR_G=0x01,UDP_ADDR_H=0x101</commands>
+      <firmware>../../../examples/udp-receiver-ipv6/example-udp-receiver.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -59,7 +84,7 @@
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>248</width>
-    <z>1</z>
+    <z>2</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -72,7 +97,7 @@
       <history>256</history>
     </plugin_config>
     <width>1067</width>
-    <z>2</z>
+    <z>1</z>
     <height>300</height>
     <location_x>0</location_x>
     <location_y>523</location_y>
@@ -81,7 +106,7 @@
   <plugin>
     se.sics.cooja.plugins.RadioLogger
     <width>1062</width>
-    <z>4</z>
+    <z>0</z>
     <height>309</height>
     <location_x>6</location_x>
     <location_y>207</location_y>
diff --git a/tools/cooja/contiki_tests/sky_shell_basic_commands.csc b/tools/cooja/contiki_tests/sky_shell_basic_commands.csc
index 549fc3713..77119182a 100644
--- a/tools/cooja/contiki_tests/sky_shell_basic_commands.csc
+++ b/tools/cooja/contiki_tests/sky_shell_basic_commands.csc
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -18,7 +21,18 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky-shell/sky-shell.c</source>
-      <command>make sky-shell.sky TARGET=sky</command>
+      <commands>make sky-shell.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky-shell/sky-shell.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
@@ -47,7 +61,7 @@
   <plugin>
     se.sics.cooja.plugins.VisState
     <width>300</width>
-    <z>3</z>
+    <z>0</z>
     <height>300</height>
     <location_x>390</location_x>
     <location_y>0</location_y>
diff --git a/tools/cooja/contiki_tests/sky_shell_collect.csc b/tools/cooja/contiki_tests/sky_shell_collect.csc
index 0f4fb478c..b9c9a9acc 100644
--- a/tools/cooja/contiki_tests/sky_shell_collect.csc
+++ b/tools/cooja/contiki_tests/sky_shell_collect.csc
@@ -1,327 +1,341 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <ticktime>1</ticktime>
-    <randomseed>123456</randomseed>
-    <motedelay>1000</motedelay>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky-shell/sky-shell.c</source>
-      <command>make sky-shell.sky TARGET=sky</command>
-    </motetype>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>87.29845932913939</x>
-        <y>60.286214311723164</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>94.30809966340686</x>
-        <y>22.50388779326399</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>2</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>82.40423567500785</x>
-        <y>39.56979106929553</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>3</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>26.185019854469438</x>
-        <y>4.800834369523899</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>4</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>1.9530156130507015</x>
-        <y>78.3175061800706</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>5</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>48.35216700543414</x>
-        <y>80.36988713780997</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>6</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>24.825985087266833</x>
-        <y>74.27809432062487</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>7</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>8.356165164293616</x>
-        <y>94.33967355724187</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>8</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>45.11740613004886</x>
-        <y>31.7059041432301</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>9</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>68.9908548386292</x>
-        <y>55.01991960639596</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>10</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>13.181122543889046</x>
-        <y>55.9636533130127</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>11</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>2.1749985906538427</x>
-        <y>78.39666095789707</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>12</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>37.79795217518357</x>
-        <y>7.164284163506062</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>13</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>64.4595177394984</x>
-        <y>72.115414337433</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>14</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>81.85663737096085</x>
-        <y>89.31412706434035</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>15</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>44.74952276297882</x>
-        <y>18.78566116347574</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>16</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>96.11333426285873</x>
-        <y>90.64560410751824</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>17</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>21.651464136783527</x>
-        <y>7.1381043251259495</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>18</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>83.6006916200628</x>
-        <y>26.97170140682981</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>19</id>
-      </interface_config>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>1.3446070721664705</x>
-        <y>7.340373220385176</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>20</id>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>223</width>
-    <z>3</z>
-    <height>227</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <history>256</history>
-    </plugin_config>
-    <width>690</width>
-    <z>2</z>
-    <height>207</height>
-    <location_x>0</location_x>
-    <location_y>439</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
+  <simulation>
+    <title>My simulation</title>
+    <delaytime>0</delaytime>
+    <ticktime>1</ticktime>
+    <randomseed>123456</randomseed>
+    <motedelay>1000</motedelay>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source>../../../examples/sky-shell/sky-shell.c</source>
+      <commands>make sky-shell.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky-shell/sky-shell.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>87.29845932913939</x>
+        <y>60.286214311723164</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>94.30809966340686</x>
+        <y>22.50388779326399</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>82.40423567500785</x>
+        <y>39.56979106929553</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>26.185019854469438</x>
+        <y>4.800834369523899</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>4</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>1.9530156130507015</x>
+        <y>78.3175061800706</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>5</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>48.35216700543414</x>
+        <y>80.36988713780997</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>6</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>24.825985087266833</x>
+        <y>74.27809432062487</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>7</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>8.356165164293616</x>
+        <y>94.33967355724187</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>8</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>45.11740613004886</x>
+        <y>31.7059041432301</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>9</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>68.9908548386292</x>
+        <y>55.01991960639596</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>10</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>13.181122543889046</x>
+        <y>55.9636533130127</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>11</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>2.1749985906538427</x>
+        <y>78.39666095789707</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>12</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>37.79795217518357</x>
+        <y>7.164284163506062</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>13</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>64.4595177394984</x>
+        <y>72.115414337433</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>14</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>81.85663737096085</x>
+        <y>89.31412706434035</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>15</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>44.74952276297882</x>
+        <y>18.78566116347574</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>16</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>96.11333426285873</x>
+        <y>90.64560410751824</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>17</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>21.651464136783527</x>
+        <y>7.1381043251259495</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>18</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>83.6006916200628</x>
+        <y>26.97170140682981</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>19</id>
+      </interface_config>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>1.3446070721664705</x>
+        <y>7.340373220385176</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>20</id>
+      </interface_config>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>223</width>
+    <z>1</z>
+    <height>227</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <history>256</history>
+    </plugin_config>
+    <width>690</width>
+    <z>0</z>
+    <height>207</height>
+    <location_x>0</location_x>
+    <location_y>439</location_y>
+    <minimized>false</minimized>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc b/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
index 27a52f456..77119182a 100644
--- a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
+++ b/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
@@ -1,70 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <ticktime>1</ticktime>
-    <randomseed>123456</randomseed>
-    <motedelay>1000</motedelay>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky-shell/sky-shell.c</source>
-      <command>make sky-shell.sky TARGET=sky</command>
-    </motetype>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>62.86427076032819</x>
-        <y>38.98246035522194</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>302</width>
-    <z>1</z>
-    <height>187</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.VisState
-    <width>300</width>
-    <z>3</z>
-    <height>300</height>
-    <location_x>390</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <history>256</history>
-    </plugin_config>
-    <width>690</width>
-    <z>2</z>
-    <height>190</height>
-    <location_x>0</location_x>
-    <location_y>457</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project>../apps/mrm</project>
+  <project>../apps/mspsim</project>
+  <project>../apps/native_gateway</project>
+  <simulation>
+    <title>My simulation</title>
+    <delaytime>0</delaytime>
+    <ticktime>1</ticktime>
+    <randomseed>123456</randomseed>
+    <motedelay>1000</motedelay>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source>../../../examples/sky-shell/sky-shell.c</source>
+      <commands>make sky-shell.sky TARGET=sky</commands>
+      <firmware>../../../examples/sky-shell/sky-shell.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>62.86427076032819</x>
+        <y>38.98246035522194</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>302</width>
+    <z>1</z>
+    <height>187</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.VisState
+    <width>300</width>
+    <z>0</z>
+    <height>300</height>
+    <location_x>390</location_x>
+    <location_y>0</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <history>256</history>
+    </plugin_config>
+    <width>690</width>
+    <z>2</z>
+    <height>190</height>
+    <location_x>0</location_x>
+    <location_y>457</location_y>
+    <minimized>false</minimized>
+  </plugin>
+</simconf>
+