From a96634faef1bce0645e7656fdd7f001e773d3c11 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Mon, 9 Apr 2018 16:27:30 +0300
Subject: [PATCH] Fix minor puzzle issues.

---
 .../Resources/Level1_Practice4.enbx           | 251 ++++++++++--------
 .../Resources/Level1_Practice6.enbx           | 246 ++++++++---------
 2 files changed, 252 insertions(+), 245 deletions(-)

diff --git a/EduNetworkBuilder/Resources/Level1_Practice4.enbx b/EduNetworkBuilder/Resources/Level1_Practice4.enbx
index 702ffc8..0dfb1fe 100644
--- a/EduNetworkBuilder/Resources/Level1_Practice4.enbx
+++ b/EduNetworkBuilder/Resources/Level1_Practice4.enbx
@@ -41,6 +41,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>176</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -65,6 +67,8 @@
         <nictype>wan</nictype>
         <uniqueidentifier>179</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -89,6 +93,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>177</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -113,6 +119,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>178</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -152,6 +160,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>191</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -176,6 +186,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>192</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -215,8 +227,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>411</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -241,8 +251,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>412</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -267,8 +275,6 @@
         <nictype>wlan</nictype>
         <uniqueidentifier>413</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>wlan2</nicname>
           <myip>
@@ -308,8 +314,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>437</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -334,8 +338,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>438</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -401,6 +403,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -425,6 +429,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -449,6 +455,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -473,6 +481,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -497,6 +507,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -521,6 +533,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -545,6 +559,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -569,6 +585,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -593,6 +611,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -632,6 +652,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>143</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -656,6 +678,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -680,6 +704,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -704,6 +730,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -728,6 +756,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>147</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -752,6 +782,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -776,6 +808,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>149</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -800,6 +834,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>150</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -824,6 +860,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -863,6 +901,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>284</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -887,6 +927,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>285</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -911,6 +953,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>286</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -935,6 +979,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>287</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -959,6 +1005,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>288</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -983,6 +1031,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>289</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1007,6 +1057,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>290</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1031,6 +1083,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>291</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1055,6 +1109,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>292</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1094,8 +1150,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>389</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1120,8 +1174,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>390</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1146,8 +1198,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>391</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1172,8 +1222,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>392</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1198,8 +1246,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>393</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1224,8 +1270,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>394</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1250,8 +1294,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>395</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1276,8 +1318,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>396</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1302,8 +1342,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>397</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1343,8 +1381,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>468</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1369,8 +1405,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>469</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1395,8 +1429,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>470</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1421,8 +1453,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>471</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1447,8 +1477,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>472</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1473,8 +1501,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>473</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1499,8 +1525,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>474</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1525,8 +1549,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>475</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1551,8 +1573,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>476</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1592,8 +1612,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>478</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1618,8 +1636,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>479</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1644,8 +1660,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>480</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1670,8 +1684,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>481</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1696,8 +1708,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>482</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1722,8 +1732,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>483</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1748,8 +1756,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>484</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1774,8 +1780,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>485</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1800,8 +1804,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>486</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1841,6 +1843,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1865,6 +1869,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1904,6 +1910,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1928,6 +1936,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1967,6 +1977,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1991,6 +2003,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2030,6 +2044,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2054,6 +2070,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2093,8 +2111,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>399</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2119,8 +2135,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>400</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2160,8 +2174,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>402</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2186,8 +2198,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>403</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2227,8 +2237,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>405</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2253,8 +2261,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>406</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2294,8 +2300,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>408</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2320,8 +2324,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>409</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2361,6 +2363,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>183</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2385,6 +2389,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>184</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2409,6 +2415,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>185</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -2448,6 +2456,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>187</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2472,6 +2482,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>188</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2496,6 +2508,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>189</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -2541,6 +2555,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>303</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2565,6 +2581,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>304</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2616,8 +2634,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>496</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2642,8 +2658,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>497</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2683,6 +2697,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2707,6 +2723,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2746,6 +2764,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2770,6 +2790,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2809,8 +2831,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>362</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2835,8 +2855,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>363</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2876,8 +2894,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>365</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2902,8 +2918,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>366</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2943,8 +2957,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>368</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2969,8 +2981,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>369</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3010,8 +3020,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>371</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3036,8 +3044,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>372</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3077,8 +3083,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>374</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3103,8 +3107,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>375</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3144,8 +3146,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>377</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3170,8 +3170,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>378</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3211,6 +3209,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3235,6 +3235,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3274,6 +3276,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>226</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3298,6 +3302,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>227</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3337,6 +3343,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>229</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3361,6 +3369,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>230</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3400,6 +3410,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>315</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3424,6 +3436,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>316</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3463,6 +3477,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>318</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3487,6 +3503,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>319</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3526,6 +3544,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>321</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3550,6 +3570,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>322</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3589,6 +3611,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>324</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3613,6 +3637,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>325</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3652,8 +3678,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>359</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3678,8 +3702,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>360</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -4055,6 +4077,11 @@
       <dhost>net_switch1</dhost>
       <thetest>DeviceIsFrozen</thetest>
     </nettest>
+    <nettest>
+      <shost>server0</shost>
+      <dhost>server1</dhost>
+      <thetest>SuccessfullyPings</thetest>
+    </nettest>
     <shape>
       <name>Grass</name>
       <what>rectangle</what>
diff --git a/EduNetworkBuilder/Resources/Level1_Practice6.enbx b/EduNetworkBuilder/Resources/Level1_Practice6.enbx
index 3efee90..2992686 100644
--- a/EduNetworkBuilder/Resources/Level1_Practice6.enbx
+++ b/EduNetworkBuilder/Resources/Level1_Practice6.enbx
@@ -41,8 +41,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>176</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -67,8 +65,6 @@
         <nictype>wan</nictype>
         <uniqueidentifier>179</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -93,8 +89,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>177</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -134,8 +128,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>191</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -160,8 +152,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>192</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -201,6 +191,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>411</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -225,6 +217,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>412</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -249,6 +243,8 @@
         <nictype>wlan</nictype>
         <uniqueidentifier>413</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>wlan2</nicname>
           <myip>
@@ -288,6 +284,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>437</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -312,6 +310,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>438</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -377,8 +377,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -403,8 +401,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -429,8 +425,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -455,8 +449,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -481,8 +473,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -507,8 +497,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -533,8 +521,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -559,8 +545,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -585,8 +569,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -626,8 +608,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>143</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -652,8 +632,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -678,8 +656,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -704,8 +680,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -730,8 +704,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>147</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -756,8 +728,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -782,8 +752,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>149</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -808,8 +776,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>150</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -834,8 +800,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -875,8 +839,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>284</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -901,8 +863,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>285</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -927,8 +887,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>286</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -953,8 +911,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>287</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -979,8 +935,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>288</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1005,8 +959,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>289</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1031,8 +983,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>290</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1057,8 +1007,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>291</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1083,8 +1031,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>292</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1124,6 +1070,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>389</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1148,6 +1096,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>390</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1172,6 +1122,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>391</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1196,6 +1148,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>392</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1220,6 +1174,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>393</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1244,6 +1200,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>394</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1268,6 +1226,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>395</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1292,6 +1252,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>396</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1316,6 +1278,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>397</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1355,6 +1319,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>468</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1379,6 +1345,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>469</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1403,6 +1371,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>470</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1427,6 +1397,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>471</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1451,6 +1423,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>472</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1475,6 +1449,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>473</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1499,6 +1475,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>474</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1523,6 +1501,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>475</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1547,6 +1527,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>476</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1586,6 +1568,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>478</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1610,6 +1594,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>479</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1634,6 +1620,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>480</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1658,6 +1646,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>481</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1682,6 +1672,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>482</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1706,6 +1698,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>483</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1730,6 +1724,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>484</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1754,6 +1750,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>485</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1778,6 +1776,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>486</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1817,8 +1817,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1843,8 +1841,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1884,8 +1880,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1910,8 +1904,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1951,8 +1943,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1977,8 +1967,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2018,8 +2006,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2044,8 +2030,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2085,6 +2069,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>399</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2109,6 +2095,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>400</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2148,6 +2136,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>402</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2172,6 +2162,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>403</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2211,6 +2203,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>405</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2235,6 +2229,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>406</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2274,6 +2270,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>408</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2298,6 +2296,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>409</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2337,8 +2337,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>183</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2363,8 +2361,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>184</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2389,8 +2385,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>185</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -2430,8 +2424,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>187</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2456,8 +2448,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>188</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2482,8 +2472,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>189</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -2529,8 +2517,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>303</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2555,8 +2541,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>304</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2608,6 +2592,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>496</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2632,6 +2618,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>497</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2671,8 +2659,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2697,8 +2683,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2738,8 +2722,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2764,8 +2746,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2805,6 +2785,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>362</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2829,6 +2811,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>363</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2868,6 +2852,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>365</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2892,6 +2878,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>366</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2931,6 +2919,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>368</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2955,6 +2945,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>369</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2994,6 +2986,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>371</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3018,6 +3012,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>372</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3057,6 +3053,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>374</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3081,6 +3079,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>375</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3120,6 +3120,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>377</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3144,6 +3146,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>378</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3183,8 +3187,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3209,8 +3211,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3250,8 +3250,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>226</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3276,8 +3274,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>227</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3317,8 +3313,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>229</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3343,8 +3337,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>230</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3384,8 +3376,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>315</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3410,8 +3400,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>316</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3451,8 +3439,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>318</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3477,8 +3463,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>319</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3518,8 +3502,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>321</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3544,8 +3526,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>322</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3585,8 +3565,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>324</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3611,8 +3589,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>325</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3652,6 +3628,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>359</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3676,6 +3654,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>360</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -4054,7 +4034,7 @@
     <nettest>
       <shost>pc4</shost>
       <dhost>google.com</dhost>
-      <thetest>SuccessfullyDHCPs</thetest>
+      <thetest>SuccessfullyPings</thetest>
     </nettest>
     <tag>Link</tag>
     <shape>