diff --git a/tools/cooja/contiki_tests/sky_shell_collect.csc b/tools/cooja/contiki_tests/sky_shell_collect.csc
index 766d876b5..e1a6117bd 100644
--- a/tools/cooja/contiki_tests/sky_shell_collect.csc
+++ b/tools/cooja/contiki_tests/sky_shell_collect.csc
@@ -1,570 +1,621 @@
-
-
- ../apps/mrm
- ../apps/mspsim
- ../apps/avrora
- ../apps/native_gateway
-
- My simulation
- 0
- generated
- 1000000
-
- se.sics.cooja.radiomediums.UDGM
- 50.0
- 100.0
- 1.0
- 1.0
-
-
- se.sics.cooja.mspmote.SkyMoteType
- sky1
- Sky Mote Type #1
-
- make clean TARGET=sky
-make sky-shell.sky TARGET=sky
- ../../../examples/sky-shell/sky-shell.sky
- se.sics.cooja.interfaces.Position
- se.sics.cooja.interfaces.IPAddress
- se.sics.cooja.interfaces.Mote2MoteRelations
- se.sics.cooja.mspmote.interfaces.MspClock
- se.sics.cooja.mspmote.interfaces.MspMoteID
- se.sics.cooja.mspmote.interfaces.SkyButton
- se.sics.cooja.mspmote.interfaces.SkyFlash
- se.sics.cooja.mspmote.interfaces.SkyByteRadio
- se.sics.cooja.mspmote.interfaces.SkySerial
- se.sics.cooja.mspmote.interfaces.SkyLED
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 87.29845932913939
- 60.286214311723164
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 1
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 94.30809966340686
- 22.50388779326399
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 2
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 82.40423567500785
- 39.56979106929553
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 3
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 26.185019854469438
- 4.800834369523899
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 4
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 1.9530156130507015
- 78.3175061800706
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 5
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 48.35216700543414
- 80.36988713780997
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 6
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 24.825985087266833
- 74.27809432062487
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 7
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 8.356165164293616
- 94.33967355724187
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 8
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 45.11740613004886
- 31.7059041432301
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 9
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 68.9908548386292
- 55.01991960639596
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 10
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 13.181122543889046
- 55.9636533130127
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 11
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 2.1749985906538427
- 78.39666095789707
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 12
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 37.79795217518357
- 7.164284163506062
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 13
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 64.4595177394984
- 72.115414337433
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 14
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 81.85663737096085
- 89.31412706434035
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 15
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 44.74952276297882
- 18.78566116347574
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 16
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 96.11333426285873
- 90.64560410751824
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 17
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 21.651464136783527
- 7.1381043251259495
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 18
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 83.6006916200628
- 26.97170140682981
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 19
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
-
- se.sics.cooja.interfaces.Position
- 1.3446070721664705
- 7.340373220385176
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 20
-
-
-
-
- se.sics.cooja.plugins.LogListener
-
-
-
- 690
- 1
- 207
- 0
- 493
- false
-
-
- se.sics.cooja.plugins.ScriptRunner
-
-
- true
-
- 600
- 2
- 700
- 259
- 0
- false
-
-
- se.sics.cooja.plugins.SimControl
- 259
- 3
- 200
- 0
- -1
- false
-
-
- se.sics.cooja.plugins.Visualizer
-
- Mote IDs
- Radio environment (UDGM)
-
- 260
- 0
- 296
- 0
- 197
- false
-
-
-
+
+
+ [CONTIKI_DIR]/tools/cooja/apps/mrm
+ [CONTIKI_DIR]/tools/cooja/apps/mspsim
+ [CONTIKI_DIR]/tools/cooja/apps/avrora
+ [CONTIKI_DIR]/tools/cooja/apps/native_gateway
+
+ My simulation
+ 0
+ generated
+ 1000000
+
+ se.sics.cooja.radiomediums.UDGM
+ 50.0
+ 150.0
+ 1.0
+ 1.0
+
+
+ 40000
+
+
+ se.sics.cooja.mspmote.SkyMoteType
+ sky1
+ Sky Mote Type #1
+
+ make clean
+make sky-shell.sky TARGET=sky
+ [CONTIKI_DIR]/examples/sky-shell/sky-shell.sky
+ se.sics.cooja.interfaces.Position
+ se.sics.cooja.interfaces.IPAddress
+ se.sics.cooja.interfaces.Mote2MoteRelations
+ se.sics.cooja.mspmote.interfaces.MspClock
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ se.sics.cooja.mspmote.interfaces.SkyButton
+ se.sics.cooja.mspmote.interfaces.SkyFlash
+ se.sics.cooja.mspmote.interfaces.SkyByteRadio
+ se.sics.cooja.mspmote.interfaces.MspSerial
+ se.sics.cooja.mspmote.interfaces.SkyLED
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 87.29845932913939
+ 60.286214311723164
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 1
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 94.30809966340686
+ 22.50388779326399
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 2
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 82.40423567500785
+ 39.56979106929553
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 3
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 26.185019854469438
+ 4.800834369523899
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 4
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 1.9530156130507015
+ 78.3175061800706
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 5
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 48.35216700543414
+ 80.36988713780997
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 6
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 24.825985087266833
+ 74.27809432062487
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 7
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 8.356165164293616
+ 94.33967355724187
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 8
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 45.11740613004886
+ 31.7059041432301
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 9
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 68.9908548386292
+ 55.01991960639596
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 10
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 13.181122543889046
+ 55.9636533130127
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 11
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 2.1749985906538427
+ 78.39666095789707
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 12
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 37.79795217518357
+ 7.164284163506062
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 13
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 64.4595177394984
+ 72.115414337433
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 14
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 81.85663737096085
+ 89.31412706434035
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 15
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 44.74952276297882
+ 18.78566116347574
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 16
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 96.11333426285873
+ 90.64560410751824
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 17
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 21.651464136783527
+ 7.1381043251259495
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 18
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 83.6006916200628
+ 26.97170140682981
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 19
+
+ sky1
+
+
+ se.sics.cooja.mspmote.SkyMote
+
+
+ se.sics.cooja.interfaces.Position
+ 1.3446070721664705
+ 7.340373220385176
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 20
+
+ sky1
+
+
+
+ se.sics.cooja.plugins.LogListener
+
+
+
+ 690
+ 2
+ 207
+ 327
+ 24
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 602
+ 3
+ 413
+ 257
+ 0
+ false
+
+
+ se.sics.cooja.plugins.SimControl
+ 259
+ 1
+ 200
+ 4
+ 0
+ false
+
+
+ se.sics.cooja.plugins.Visualizer
+
+ se.sics.cooja.plugins.skins.IDVisualizerSkin
+ se.sics.cooja.plugins.skins.UDGMVisualizerSkin
+ 2.3981827551130066 0.0 0.0 2.3981827551130066 8.139022870763759 0.1214717784430076
+
+ 260
+ 4
+ 296
+ 0
+ 197
+ false
+
+
+ se.sics.cooja.plugins.TimeLine
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 18
+ 19
+
+
+
+ 118
+ 9
+
+ 1024
+ 0
+ 438
+ 0
+ 260
+ false
+
+
+