diff --git a/config/tests/guest/libvirt/pci_passthrough.cfg b/config/tests/guest/libvirt/pci_passthrough.cfg
index 27aa54d..e803498 100644
--- a/config/tests/guest/libvirt/pci_passthrough.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
+ioa_system_info = <_ioa_system_info_>
 # enter the functioninjection values your system supports 4 or 6 
-func = "6"
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"
diff --git a/config/tests/guest/libvirt/pci_passthrough_p1.cfg b/config/tests/guest/libvirt/pci_passthrough_p1.cfg
index f5ed945..39c6ad3 100644
--- a/config/tests/guest/libvirt/pci_passthrough_p1.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough_p1.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
-# enter the functioninjection values your system supports 4 or 6 
-func = "6"
+ioa_system_info = <_ioa_system_info_>
+# enter the functioninjection values your system supports 4 or 6
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"
diff --git a/config/tests/guest/libvirt/pci_passthrough_p2.cfg b/config/tests/guest/libvirt/pci_passthrough_p2.cfg
index 4bb1024..bd260ab 100644
--- a/config/tests/guest/libvirt/pci_passthrough_p2.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough_p2.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
-# enter the functioninjection values your system supports 4 or 6 
-func = "6"
+ioa_system_info = <_ioa_system_info_>
+# enter the functioninjection values your system supports 4 or 6
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"
diff --git a/config/tests/guest/libvirt/pci_passthrough_p3.cfg b/config/tests/guest/libvirt/pci_passthrough_p3.cfg
index d78fd33..210ba81 100644
--- a/config/tests/guest/libvirt/pci_passthrough_p3.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough_p3.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
-# enter the functioninjection values your system supports 4 or 6 
-func = "6"
+ioa_system_info = <_ioa_system_info_>
+# enter the functioninjection values your system supports 4 or 6
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"