diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index 27a213e91..497132c87 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -214,10 +214,9 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
     this.myCpu.setMonitorExec(true);
     this.myCpu.setTrace(0); /* TODO Enable */
 
-    int[] memory = myCpu.memory;
     logger.info("Loading firmware from: " + fileELF.getAbsolutePath());
     GUI.setProgressMessage("Loading " + fileELF.getName());
-    node.loadFirmware(((MspMoteType)getType()).getELF(), memory);
+    node.loadFirmware(((MspMoteType)getType()).getELF());
 
     /* Throw exceptions at bad memory access */
     /*myCpu.setThrowIfWarning(true);*/
@@ -417,6 +416,10 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
         }
 
         MoteInterface moteInterface = getInterfaces().getInterfaceOfType(moteInterfaceClass);
+        if (moteInterface == null) {
+            logger.fatal("Could not find mote interface of class: " + moteInterfaceClass);
+            return false;
+        }
         moteInterface.setConfigXML(element.getChildren(), visAvailable);
       }
     }
diff --git a/tools/cooja/contiki_tests/cooja_helloworld.csc b/tools/cooja/contiki_tests/cooja_helloworld.csc
index 8d7f6fa5a..ce8961801 100644
--- a/tools/cooja/contiki_tests/cooja_helloworld.csc
+++ b/tools/cooja/contiki_tests/cooja_helloworld.csc
@@ -1,113 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project>../apps/mrm</project>
-  <project>../apps/mspsim</project>
-  <project>../apps/avrora</project>
-  <project>../apps/native_gateway</project>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <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>mtype82</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>
-      <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.ContikiCFS</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
-      <symbols>false</symbols>
-      <commstack>Rime</commstack>
-    </motetype>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype82</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>69.64867743029201</x>
-        <y>69.2570131081022</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>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>Mote IDs</skin>
-      <skin>Log output: printf()'s</skin>
-    </plugin_config>
-    <width>259</width>
-    <z>1</z>
-    <height>198</height>
-    <location_x>2</location_x>
-    <location_y>203</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-    </plugin_config>
-    <width>259</width>
-    <z>2</z>
-    <height>217</height>
-    <location_x>2</location_x>
-    <location_y>403</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>259</width>
-    <z>3</z>
-    <height>200</height>
-    <location_x>2</location_x>
-    <location_y>3</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.equals('Hello, world'));
-log.testOK();</script>
-      <active>true</active>
-    </plugin_config>
-    <width>592</width>
-    <z>0</z>
-    <height>618</height>
-    <location_x>264</location_x>
-    <location_y>3</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World test (Cooja motes)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.contikimote.ContikiMoteType
+      <identifier>mtype725</identifier>
+      <description>Contiki Mote Type #1</description>
+      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <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>
+      <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.interfaces.RimeAddress</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.ContikiCFS</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>69.64867743029201</x>
+        <y>69.2570131081022</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>mtype725</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
+      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 59.68302051791636 6.039078992634368</viewport>
+    </plugin_config>
+    <width>259</width>
+    <z>1</z>
+    <height>198</height>
+    <location_x>2</location_x>
+    <location_y>203</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>259</width>
+    <z>2</z>
+    <height>217</height>
+    <location_x>2</location_x>
+    <location_y>403</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>259</width>
+    <z>3</z>
+    <height>200</height>
+    <location_x>2</location_x>
+    <location_y>3</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>592</width>
+    <z>0</z>
+    <height>618</height>
+    <location_x>318</location_x>
+    <location_y>61</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/esb_helloworld.csc b/tools/cooja/contiki_tests/esb_helloworld.csc
index 8fa3806fe..0124455fc 100644
--- a/tools/cooja/contiki_tests/esb_helloworld.csc
+++ b/tools/cooja/contiki_tests/esb_helloworld.csc
@@ -1,125 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project>[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
-  <project>[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
-  <project>[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <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>
-    <events>
-      <logoutput>40000</logoutput>
-    </events>
-    <motetype>
-      se.sics.cooja.mspmote.ESBMoteType
-      <identifier>esb1</identifier>
-      <description>ESB Mote Type #esb1</description>
-      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
-      <commands>make clean TARGET=esb
-make hello-world.esb TARGET=esb</commands>
-      <firmware>[CONTIKI_DIR]/examples/hello-world/hello-world.esb</firmware>
-      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
-      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</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>
-    <mote>
-      se.sics.cooja.mspmote.ESBMote
-      <breakpoints />
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>57.296459690977144</x>
-        <y>73.20759478605089</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-      <motetype_identifier>esb1</motetype_identifier>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>259</width>
-    <z>6</z>
-    <height>184</height>
-    <location_x>60</location_x>
-    <location_y>60</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
-      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 91.91230937183896 53.4476411035901</viewport>
-    </plugin_config>
-    <width>300</width>
-    <z>3</z>
-    <height>300</height>
-    <location_x>945</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-    </plugin_config>
-    <width>1245</width>
-    <z>5</z>
-    <height>150</height>
-    <location_x>0</location_x>
-    <location_y>530</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.TimeLine
-    <plugin_config>
-      <mote>0</mote>
-      <showRadioRXTX />
-      <showRadioHW />
-      <showLEDs />
-      <split>109</split>
-      <zoom>9</zoom>
-    </plugin_config>
-    <width>1245</width>
-    <z>1</z>
-    <height>150</height>
-    <location_x>0</location_x>
-    <location_y>680</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(5000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.equals('Hello, world'));
-log.testOK();</script>
-      <active>true</active>
-    </plugin_config>
-    <width>600</width>
-    <z>0</z>
-    <height>453</height>
-    <location_x>337</location_x>
-    <location_y>25</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World (ESB)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.ESBMoteType
+      <identifier>esb1</identifier>
+      <description>ESB Mote Type #esb1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands EXPORT="discard">make hello-world.esb TARGET=esb</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.esb</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</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>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>57.296459690977144</x>
+        <y>73.20759478605089</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>esb1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>623</width>
+    <z>1</z>
+    <height>270</height>
+    <location_x>29</location_x>
+    <location_y>256</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>0</z>
+    <height>453</height>
+    <location_x>337</location_x>
+    <location_y>25</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>20</location_x>
+    <location_y>23</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/exp5438_helloworld.csc b/tools/cooja/contiki_tests/exp5438_helloworld.csc
new file mode 100644
index 000000000..e2672c7a5
--- /dev/null
+++ b/tools/cooja/contiki_tests/exp5438_helloworld.csc
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World (Exp5438)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.Exp5438MoteType
+      <identifier>exp5438#1</identifier>
+      <description>Exp5438 Mote Type exp5438#1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands EXPORT="discard">make hello-world.exp5438 TARGET=exp5438</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.exp5438</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.UsciA1Serial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.Exp5438LED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>26.321738050614275</x>
+        <y>34.93092009073432</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>exp5438#1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>38</location_x>
+    <location_y>49</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>680</width>
+    <z>1</z>
+    <height>240</height>
+    <location_x>86</location_x>
+    <location_y>384</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>0</z>
+    <height>700</height>
+    <location_x>347</location_x>
+    <location_y>21</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/hello-world.js b/tools/cooja/contiki_tests/hello-world.js
new file mode 100644
index 000000000..5afaabe18
--- /dev/null
+++ b/tools/cooja/contiki_tests/hello-world.js
@@ -0,0 +1,9 @@
+TIMEOUT(5000);
+
+while(true) {
+  log.log("> " + msg + "\n");
+  if (msg.equals('Hello, world')) {
+    log.testOK();
+  }
+  YIELD();
+}
diff --git a/tools/cooja/contiki_tests/micaz_helloworld.csc b/tools/cooja/contiki_tests/micaz_helloworld.csc
index 4906774f9..c8c9a04d8 100644
--- a/tools/cooja/contiki_tests/micaz_helloworld.csc
+++ b/tools/cooja/contiki_tests/micaz_helloworld.csc
@@ -1,120 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project>../apps/mrm</project>
-  <project>../apps/mspsim</project>
-  <project>../apps/avrora</project>
-  <simulation>
-    <title>My simulation</title>
-    <delaytime>0</delaytime>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <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>
-    <events>
-      <logoutput>40000</logoutput>
-    </events>
-    <motetype>
-      se.sics.cooja.avrmote.MicaZMoteType
-      <identifier>micaz1</identifier>
-      <description>MicaZ Mote Type #micaz1</description>
-      <source>../../../examples/hello-world/hello-world.c</source>
-      <commands>make clean TARGET=micaz
-make hello-world.elf TARGET=micaz</commands>
-      <firmware>../../../examples/hello-world/hello-world.elf</firmware>
-      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
-      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZID</moteinterface>
-      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZLED</moteinterface>
-      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZRadio</moteinterface>
-      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaClock</moteinterface>
-      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaSerial</moteinterface>
-    </motetype>
-    <mote>
-      se.sics.cooja.avrmote.MicaZMote
-      <motetype_identifier>micaz1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>68.44103812985554</x>
-        <y>35.6791174319418</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.avrmote.interfaces.MicaZID
-        <id>1</id>
-      </interface_config>
-    </mote>
-  </simulation>
-  <plugin>
-    se.sics.cooja.plugins.SimControl
-    <width>259</width>
-    <z>4</z>
-    <height>184</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
-      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 81.78087442740406 87.56443869823474</viewport>
-    </plugin_config>
-    <width>300</width>
-    <z>1</z>
-    <height>300</height>
-    <location_x>456</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-    </plugin_config>
-    <width>756</width>
-    <z>2</z>
-    <height>150</height>
-    <location_x>0</location_x>
-    <location_y>286</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.TimeLine
-    <plugin_config>
-      <mote>0</mote>
-      <showRadioRXTX />
-      <showRadioHW />
-      <showLEDs />
-      <split>109</split>
-      <zoom>9</zoom>
-    </plugin_config>
-    <width>756</width>
-    <z>3</z>
-    <height>150</height>
-    <location_x>0</location_x>
-    <location_y>436</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.startsWith('Hello, world'));
-log.testOK();</script>
-      <active>true</active>
-    </plugin_config>
-    <width>600</width>
-    <z>0</z>
-    <height>305</height>
-    <location_x>89</location_x>
-    <location_y>211</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World (MicaZ)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.avrmote.MicaZMoteType
+      <identifier>micaz1</identifier>
+      <description>MicaZ Mote Type #micaz1</description>
+      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands>make hello-world.elf TARGET=micaz</commands>
+      <firmware>[CONTIKI_DIR]/examples/hello-world/hello-world.elf</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZID</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZLED</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZRadio</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaClock</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.MicaSerial</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+    </motetype>
+    <mote>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>36.478849033811386</x>
+        <y>97.17795415366507</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.avrmote.interfaces.MicaZID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>micaz1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>17</location_x>
+    <location_y>16</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>680</width>
+    <z>1</z>
+    <height>240</height>
+    <location_x>20</location_x>
+    <location_y>285</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>0</z>
+    <height>535</height>
+    <location_x>403</location_x>
+    <location_y>23</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/sky_helloworld.csc b/tools/cooja/contiki_tests/sky_helloworld.csc
index e97b4f6d7..fb216a3ee 100644
--- a/tools/cooja/contiki_tests/sky_helloworld.csc
+++ b/tools/cooja/contiki_tests/sky_helloworld.csc
@@ -1,80 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project>../apps/mrm</project>
-  <project>../apps/mspsim</project>
-  <project>../apps/avrora</project>
-  <project>../apps/native_gateway</project>
-  <simulation>
-    <title>Hello World (Sky)</title>
-    <delaytime>0</delaytime>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <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/hello-world/hello-world.c</source>
-      <commands>make clean TARGET=sky
-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.interfaces.IPAddress</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>
-      <breakpoints />
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>64.11203103628397</x>
-        <y>93.06735634828134</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>248</width>
-    <z>1</z>
-    <height>200</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.equals('Hello, world'));
-log.testOK();</script>
-      <active>true</active>
-    </plugin_config>
-    <width>541</width>
-    <z>0</z>
-    <height>448</height>
-    <location_x>248</location_x>
-    <location_y>-1</location_y>
-    <minimized>false</minimized>
-  </plugin>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World test (Sky)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands EXPORT="discard">make hello-world.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</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.Msp802154Radio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>64.11203103628397</x>
+        <y>93.06735634828134</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>541</width>
+    <z>0</z>
+    <height>448</height>
+    <location_x>299</location_x>
+    <location_y>7</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>7</location_x>
+    <location_y>10</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>680</width>
+    <z>1</z>
+    <height>240</height>
+    <location_x>51</location_x>
+    <location_y>288</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/wismote_helloworld.csc b/tools/cooja/contiki_tests/wismote_helloworld.csc
new file mode 100644
index 000000000..52a16396e
--- /dev/null
+++ b/tools/cooja/contiki_tests/wismote_helloworld.csc
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World (Wismote)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.WismoteMoteType
+      <identifier>wismote1</identifier>
+      <description>Wismote Mote Type #wismote1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands EXPORT="discard">make hello-world.wismote TARGET=wismote</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.wismote</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDefaultSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>36.76551518369201</x>
+        <y>29.330591009779383</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>wismote1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>22</location_x>
+    <location_y>14</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>680</width>
+    <z>1</z>
+    <height>240</height>
+    <location_x>84</location_x>
+    <location_y>408</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>0</z>
+    <height>548</height>
+    <location_x>335</location_x>
+    <location_y>22</location_y>
+  </plugin>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/z1_helloworld.csc b/tools/cooja/contiki_tests/z1_helloworld.csc
new file mode 100644
index 000000000..3af73dc00
--- /dev/null
+++ b/tools/cooja/contiki_tests/z1_helloworld.csc
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>Hello World (Z1)</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <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>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.Z1MoteType
+      <identifier>z11</identifier>
+      <description>Z1 Mote Type #z11</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
+      <commands EXPORT="discard">make hello-world.z1 TARGET=z1</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.z1</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDefaultSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>94.96401380574989</x>
+        <y>21.247662337471553</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>z11</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>38</location_x>
+    <location_y>13</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>680</width>
+    <z>1</z>
+    <height>240</height>
+    <location_x>109</location_x>
+    <location_y>377</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>0</z>
+    <height>700</height>
+    <location_x>330</location_x>
+    <location_y>24</location_y>
+  </plugin>
+</simconf>
+