diff --git a/scenarios/tests/test_scenario_wp2.xml b/scenarios/tests/test_scenario_wp2.xml
index 4f9acdcf7..d80738c3e 100644
--- a/scenarios/tests/test_scenario_wp2.xml
+++ b/scenarios/tests/test_scenario_wp2.xml
@@ -3,57 +3,9 @@
 <scenario xmlns="http://www.github/cliffe/SecGen/scenario"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
-  <!--<system>-->
-    <!--<system_name>wp_2x_stretch_https</system_name>-->
-    <!--<base platform="linux" distro="Debian 9" type="server"/>-->
-
-    <!--<input into_datastore="IP_addresses">-->
-      <!--<value>172.16.0.2</value>-->
-      <!--<value>172.16.0.3</value>-->
-      <!--<value>172.16.0.4</value>-->
-      <!--<value>172.16.0.5</value>-->
-    <!--</input>-->
-
-    <!--<vulnerability module_path=".*wordpress_2x.*">-->
-      <!--<input into="https">-->
-        <!--<value>true</value>-->
-      <!--</input>-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="0">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</vulnerability>-->
-
-    <!--<network type="private_network">-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="0">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</network>-->
-  <!--</system>-->
-
-  <!--<system>-->
-    <!--<system_name>wp_2x_stretch_http</system_name>-->
-    <!--<base platform="linux" distro="Debian 9" type="server"/>-->
-
-
-    <!--<vulnerability module_path=".*wordpress_2x.*">-->
-      <!--<input into="https">-->
-        <!--<value>false</value>-->
-      <!--</input>-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="1">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</vulnerability>-->
-
-    <!--<network type="private_network">-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="1">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</network>-->
-  <!--</system>-->
-
   <system>
-    <system_name>wp_2x_wheezy_https</system_name>
-    <base platform="linux" distro="Debian 7.8" type="server"/>
+    <system_name>wp_2x_stretch_https</system_name>
+    <base platform="linux" distro="Debian 9" type="server"/>
 
     <input into_datastore="IP_addresses">
       <value>172.16.0.2</value>
@@ -62,6 +14,46 @@
       <value>172.16.0.5</value>
     </input>
 
+    <vulnerability module_path=".*wordpress_2x.*">
+      <input into="https">
+        <value>true</value>
+      </input>
+      <input into="IP_address">
+        <datastore access="0">IP_addresses</datastore>
+      </input>
+    </vulnerability>
+
+    <network type="private_network">
+      <input into="IP_address">
+        <datastore access="0">IP_addresses</datastore>
+      </input>
+    </network>
+  </system>
+
+  <system>
+    <system_name>wp_2x_stretch_http</system_name>
+    <base platform="linux" distro="Debian 9" type="server"/>
+
+    <vulnerability module_path=".*wordpress_2x.*">
+      <input into="https">
+        <value>false</value>
+      </input>
+      <input into="IP_address">
+        <datastore access="1">IP_addresses</datastore>
+      </input>
+    </vulnerability>
+
+    <network type="private_network">
+      <input into="IP_address">
+        <datastore access="1">IP_addresses</datastore>
+      </input>
+    </network>
+  </system>
+
+  <system>
+    <system_name>wp_2x_wheezy_https</system_name>
+    <base platform="linux" distro="Debian 7.8" type="server"/>
+
     <vulnerability module_path=".*wordpress_2x.*">
       <input into="https">
         <value>true</value>
@@ -88,13 +80,13 @@
         <value>false</value>
       </input>
       <input into="IP_address">
-        <datastore access="2">IP_addresses</datastore>
+        <datastore access="3">IP_addresses</datastore>
       </input>
     </vulnerability>
 
     <network type="private_network">
       <input into="IP_address">
-        <datastore access="2">IP_addresses</datastore>
+        <datastore access="3">IP_addresses</datastore>
       </input>
     </network>
   </system>