diff --git a/pod-test-playbook.yml b/pod-test-playbook.yml
index 75e6fc6..fdfa4fb 100644
--- a/pod-test-playbook.yml
+++ b/pod-test-playbook.yml
@@ -20,7 +20,7 @@
   hosts: head
   become: yes
   roles:
-    - maas-test-client-install
+    - test-client-install
 
 - name: Create test subscriber
   hosts: head
diff --git a/roles/compute-diag/tasks/main.yml b/roles/compute-diag/tasks/main.yml
index c2012e9..1952992 100644
--- a/roles/compute-diag/tasks/main.yml
+++ b/roles/compute-diag/tasks/main.yml
@@ -47,6 +47,7 @@
    - "sudo ovs-appctl fdb/show br-int"
    - "sudo ovs-appctl vlog/list"
    - "sudo ovs-dpctl dump-flows"
+   - "sudo ovs-dpctl show"
    - "sudo ovs-ofctl dump-flows br-int"
    - "sudo ovs-ofctl dump-ports br-int"
    - "sudo ovs-ofctl dump-ports-desc br-int"
diff --git a/roles/compute-prep/tasks/main.yml b/roles/compute-prep/tasks/main.yml
index bf596de..bd3053f 100644
--- a/roles/compute-prep/tasks/main.yml
+++ b/roles/compute-prep/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # file: compute-prep/tasks/main.yml
 
 - name: Install packages
@@ -66,3 +64,4 @@
   pip:
     name: "requests"
     state: absent
+
diff --git a/roles/test-client-install/defaults/main.yml b/roles/test-client-install/defaults/main.yml
new file mode 100644
index 0000000..e68f99c
--- /dev/null
+++ b/roles/test-client-install/defaults/main.yml
@@ -0,0 +1,19 @@
+---
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# test-client-install/defaults/main.yml
+
+headnode_fabric_bridge: fabric
+
diff --git a/roles/maas-test-client-install/tasks/main.yml b/roles/test-client-install/tasks/main.yml
similarity index 95%
rename from roles/maas-test-client-install/tasks/main.yml
rename to roles/test-client-install/tasks/main.yml
index 45a29f7..dd4f467 100644
--- a/roles/maas-test-client-install/tasks/main.yml
+++ b/roles/test-client-install/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
-# maas-test-client-install/tasks/main.yml
+# test-client-install/tasks/main.yml
 
 - name: Create testclient LXD profile
   lxd_profile:
@@ -42,7 +40,7 @@
     devices:
       eth0:
         nictype: macvlan
-        parent: fabric
+        parent: "{{ headnode_fabric_bridge }}"
         type: nic
 
 - name: Create testclient container
diff --git a/roles/test-exampleservice/tasks/main.yml b/roles/test-exampleservice/tasks/main.yml
index 97969e6..c3ed350 100644
--- a/roles/test-exampleservice/tasks/main.yml
+++ b/roles/test-exampleservice/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
-# test-examplservice/tasks/main.yml
+# test-exampleservice/tasks/main.yml
 # Run tests to check that the single-node deployment has worked
 
 - name: Configure XOS with profile specific TOSCA (new Engine)
diff --git a/roles/test-subscriber-config/tasks/main.yml b/roles/test-subscriber-config/tasks/main.yml
index 77e195f..c3197fc 100644
--- a/roles/test-subscriber-config/tasks/main.yml
+++ b/roles/test-subscriber-config/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # test-subscriber-config/tasks/main.yml
 
 - name: Create test-subscriber.yaml TOSCA config
diff --git a/roles/test-subscriber-enable/defaults/main.yml b/roles/test-subscriber-enable/defaults/main.yml
index a17a3c7..6471fd0 100644
--- a/roles/test-subscriber-enable/defaults/main.yml
+++ b/roles/test-subscriber-enable/defaults/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # test-subscriber-enable/defaults/main.yml
 
 xos_tosca_url: "http://xos-tosca/xos-tosca"
@@ -24,4 +22,5 @@
 head_cord_profile_dir: "/opt/cord_profile"
 
 xos_admin_user: "xosadmin@opencord.org"
-head_xos_admin_pass: "{{ lookup('file', head_credentials_dir ~ '/' ~ xos_admin_user) }}"
\ No newline at end of file
+head_xos_admin_pass: "{{ lookup('file', head_credentials_dir ~ '/' ~ xos_admin_user) }}"
+
diff --git a/roles/test-subscriber-enable/tasks/main.yml b/roles/test-subscriber-enable/tasks/main.yml
index d3b0d24..733b4b2 100644
--- a/roles/test-subscriber-enable/tasks/main.yml
+++ b/roles/test-subscriber-enable/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # test-subscriber-enable/tasks/main.yml
 
 - name: Run TOSCA to add test-subscriber
diff --git a/roles/test-vsg/tasks/main.yml b/roles/test-vsg/tasks/main.yml
index 50adb92..a26fc96 100644
--- a/roles/test-vsg/tasks/main.yml
+++ b/roles/test-vsg/tasks/main.yml
@@ -48,8 +48,8 @@
   shell: ssh -o ProxyCommand="ssh -W %h:%p -l ubuntu {{ node_name.stdout }}" ubuntu@{{ mgmt_ip.stdout }} "sudo docker ps|grep 'vsg\|vcpe'" > /dev/null
   register: result
   until: result | success
-  retries: 20
-  delay: 60
+  retries: 40
+  delay: 30
   tags:
     - skip_ansible_lint # running a sub job