diff --git a/tools/cooja/contiki_tests/cooja_ipv6_udp.csc b/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
index 3ae77a49d..8f7412fd7 100644
--- a/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
+++ b/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
@@ -1,9 +1,9 @@
 <?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>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -16,12 +16,15 @@
       <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>mtype232</identifier>
+      <identifier>mtype783</identifier>
       <description>Receiver</description>
-      <contikiapp>../../../examples/udp-receiver-ipv6/example-udp-receiver.c</contikiapp>
-      <commands>make example-udp-receiver.cooja TARGET=cooja DEFINES=WITH_UIP6=1,UIP_CONF_IPV6=1,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x2,UDP_ADDR_F=0x2ff,UDP_ADDR_G=0xfe02,UDP_ADDR_H=0x0202</commands>
+      <contikiapp>[CONTIKI_DIR]/examples/udp-receiver-ipv6/example-udp-receiver.c</contikiapp>
+      <commands>make example-udp-receiver.cooja TARGET=cooja DEFINES=UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x2,UDP_ADDR_F=0x2ff,UDP_ADDR_G=0xfe02,UDP_ADDR_H=0x0202</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -36,15 +39,16 @@
       <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>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
       <symbols>false</symbols>
-      <commstack>uIPv6</commstack>
     </motetype>
     <motetype>
       se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype330</identifier>
+      <identifier>mtype512</identifier>
       <description>Sender</description>
-      <contikiapp>../../../examples/udp-sender-ipv6/example-udp-sender.c</contikiapp>
-      <commands>make example-udp-sender.cooja TARGET=cooja DEFINES=WITH_UIP6=1,UIP_CONF_IPV6=1,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x301,UDP_ADDR_F=0x1ff,UDP_ADDR_G=0xfe01,UDP_ADDR_H=0x101</commands>
+      <contikiapp>[CONTIKI_DIR]/examples/udp-sender-ipv6/example-udp-sender.c</contikiapp>
+      <commands>make example-udp-sender.cooja TARGET=cooja DEFINES=UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x301,UDP_ADDR_F=0x1ff,UDP_ADDR_G=0xfe01,UDP_ADDR_H=0x101</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -59,50 +63,41 @@
       <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>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
       <symbols>false</symbols>
-      <commstack>uIPv6</commstack>
     </motetype>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype232</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>98.76075470611741</x>
         <y>30.469519951198897</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>
+      <motetype_identifier>mtype783</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <motetype_identifier>mtype330</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>58.59043340181549</x>
         <y>22.264557758786697</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>
+      <motetype_identifier>mtype512</motetype_identifier>
     </mote>
   </simulation>
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>248</width>
-    <z>4</z>
+    <z>2</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
@@ -113,9 +108,9 @@
     <plugin_config>
       <filter>ID:1</filter>
     </plugin_config>
-    <width>249</width>
-    <z>2</z>
-    <height>181</height>
+    <width>851</width>
+    <z>1</z>
+    <height>187</height>
     <location_x>1</location_x>
     <location_y>521</location_y>
     <minimized>false</minimized>
@@ -123,7 +118,10 @@
   <plugin>
     se.sics.cooja.plugins.Visualizer
     <plugin_config>
-      <skin>Radio environment (UDGM)</skin>
+      <skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.TrafficVisualizerSkin</skin>
+      <viewport>2.565713585691764 0.0 0.0 2.565713585691764 -91.30090099174814 -28.413835696190525</viewport>
     </plugin_config>
     <width>246</width>
     <z>3</z>
@@ -134,8 +132,11 @@
   </plugin>
   <plugin>
     se.sics.cooja.plugins.RadioLogger
+    <plugin_config>
+      <split>150</split>
+    </plugin_config>
     <width>246</width>
-    <z>1</z>
+    <z>4</z>
     <height>198</height>
     <location_x>0</location_x>
     <location_y>323</location_y>
@@ -169,7 +170,7 @@ log.testOK(); /* Report test success and quit */</script>
     </plugin_config>
     <width>600</width>
     <z>0</z>
-    <height>700</height>
+    <height>520</height>
     <location_x>250</location_x>
     <location_y>-1</location_y>
     <minimized>false</minimized>
diff --git a/tools/cooja/contiki_tests/crosslevel.csc b/tools/cooja/contiki_tests/crosslevel.csc
index 8929087d3..16cc5f5db 100644
--- a/tools/cooja/contiki_tests/crosslevel.csc
+++ b/tools/cooja/contiki_tests/crosslevel.csc
@@ -24,7 +24,7 @@
       <description>Sky Mote Type #1</description>
       <source>[CONTIKI_DIR]/examples/rime/example-abc.c</source>
       <commands>make clean TARGET=sky
-make example-abc.sky TARGET=sky DEFINES=MAC_DRIVER=nullmac_driver</commands>
+make example-abc.sky TARGET=sky DEFINES=NETSTACK_MAC=nullmac_driver,NETSTACK_RDC=nullrdc_driver</commands>
       <firmware>[CONTIKI_DIR]/examples/rime/example-abc.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
@@ -46,7 +46,7 @@ make example-abc.sky TARGET=sky DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <description>ESB Mote Type #1</description>
       <source>[CONTIKI_DIR]/examples/rime/example-abc.c</source>
       <commands>make clean TARGET=esb
-make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
+make example-abc.esb TARGET=esb DEFINES=NETSTACK_MAC=nullmac_driver,NETSTACK_RDC=nullrdc_driver</commands>
       <firmware>[CONTIKI_DIR]/examples/rime/example-abc.esb</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
@@ -61,10 +61,10 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
     </motetype>
     <motetype>
       se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype135</identifier>
+      <identifier>mtype430</identifier>
       <description>Contiki Mote Type #1</description>
       <contikiapp>[CONTIKI_DIR]/examples/rime/example-abc.c</contikiapp>
-      <commands>make example-abc.cooja TARGET=cooja</commands>
+      <commands>make example-abc.cooja TARGET=cooja DEFINES=NETSTACK_MAC=nullmac_driver,NETSTACK_RDC=nullrdc_driver</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
       <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -81,7 +81,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
       <symbols>false</symbols>
-      <commstack>Rime</commstack>
     </motetype>
     <motetype>
       se.sics.cooja.motes.ImportAppMoteType
@@ -91,7 +90,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <moteclass>RimeABC</moteclass>
     </motetype>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>199.49101781472754</x>
@@ -102,10 +100,9 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
         <id>6</id>
       </interface_config>
-      <motetype_identifier>mtype135</motetype_identifier>
+      <motetype_identifier>mtype430</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>98.81565434011203</x>
@@ -116,10 +113,9 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
         <id>12</id>
       </interface_config>
-      <motetype_identifier>mtype135</motetype_identifier>
+      <motetype_identifier>mtype430</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -134,7 +130,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -149,7 +144,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.ESBMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -164,7 +158,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.ESBMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -179,7 +172,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>-3.557828103468252</x>
@@ -190,10 +182,9 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
         <id>16</id>
       </interface_config>
-      <motetype_identifier>mtype135</motetype_identifier>
+      <motetype_identifier>mtype430</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -208,7 +199,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.ESBMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -223,7 +213,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -238,7 +227,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.ESBMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -253,7 +241,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
     <mote>
-      RimeABC
       <interface_config>
         se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
         <id>14</id>
@@ -267,7 +254,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>apptype1</motetype_identifier>
     </mote>
     <mote>
-      RimeABC
       <interface_config>
         se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
         <id>8</id>
@@ -281,7 +267,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>apptype1</motetype_identifier>
     </mote>
     <mote>
-      RimeABC
       <interface_config>
         se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
         <id>19</id>
@@ -295,7 +280,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>apptype1</motetype_identifier>
     </mote>
     <mote>
-      RimeABC
       <interface_config>
         se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
         <id>20</id>
@@ -309,7 +293,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>apptype1</motetype_identifier>
     </mote>
     <mote>
-      RimeABC
       <interface_config>
         se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
         <id>18</id>
@@ -323,7 +306,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>apptype1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -338,7 +320,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.mspmote.ESBMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
@@ -353,7 +334,6 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>100.5701822839116</x>
@@ -364,10 +344,9 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
         <id>17</id>
       </interface_config>
-      <motetype_identifier>mtype135</motetype_identifier>
+      <motetype_identifier>mtype430</motetype_identifier>
     </mote>
     <mote>
-      se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
         <x>-5.14611380187246</x>
@@ -378,13 +357,13 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
         <id>15</id>
       </interface_config>
-      <motetype_identifier>mtype135</motetype_identifier>
+      <motetype_identifier>mtype430</motetype_identifier>
     </mote>
   </simulation>
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>265</width>
-    <z>3</z>
+    <z>5</z>
     <height>200</height>
     <location_x>0</location_x>
     <location_y>1</location_y>
@@ -396,7 +375,7 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
       <filter />
     </plugin_config>
     <width>953</width>
-    <z>0</z>
+    <z>3</z>
     <height>130</height>
     <location_x>0</location_x>
     <location_y>524</location_y>
@@ -404,8 +383,11 @@ make example-abc.esb TARGET=esb DEFINES=MAC_DRIVER=nullmac_driver</commands>
   </plugin>
   <plugin>
     se.sics.cooja.plugins.RadioLogger
+    <plugin_config>
+      <split>110</split>
+    </plugin_config>
     <width>695</width>
-    <z>5</z>
+    <z>2</z>
     <height>152</height>
     <location_x>260</location_x>
     <location_y>369</location_y>
@@ -458,7 +440,7 @@ while (true) {
       <active>true</active>
     </plugin_config>
     <width>692</width>
-    <z>2</z>
+    <z>4</z>
     <height>367</height>
     <location_x>264</location_x>
     <location_y>0</location_y>
@@ -493,7 +475,7 @@ while (true) {
       <zoom>12</zoom>
     </plugin_config>
     <width>956</width>
-    <z>6</z>
+    <z>1</z>
     <height>310</height>
     <location_x>-1</location_x>
     <location_y>655</location_y>
@@ -509,7 +491,7 @@ while (true) {
       <viewport>0.5766712294536613 0.0 0.0 0.5766712294536613 36.4700887534336 117.76935499005339</viewport>
     </plugin_config>
     <width>264</width>
-    <z>1</z>
+    <z>0</z>
     <height>321</height>
     <location_x>0</location_x>
     <location_y>201</location_y>
diff --git a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc b/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
index 1d0632e28..4f5427248 100644
--- a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
+++ b/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
@@ -21,7 +21,7 @@
       <identifier>mtype511</identifier>
       <description>Contiki Mote Type #1</description>
       <contikiapp>../../../examples/telnet-server/telnet-server.c</contikiapp>
-      <commands>make telnet-server.cooja TARGET=cooja DEFINES=WITH_UIP=1</commands>
+      <commands>make telnet-server.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>