diff --git a/.gitignore b/.gitignore
index 03940d33..795161d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.tgz
 *.tar.gz
 osc
+ibs
+test.log
diff --git a/SAPHanaSR-angi.spec b/SAPHanaSR-angi.spec
index 8d7a8be6..702be97e 100644
--- a/SAPHanaSR-angi.spec
+++ b/SAPHanaSR-angi.spec
@@ -21,7 +21,7 @@ License:        GPL-2.0
 Group:          Productivity/Clustering/HA
 AutoReqProv:    on
 Summary:        Resource agents to control the HANA database in system replication setup
-Version:        1.2.3
+Version:        1.2.4
 Release:        0
 Url:            https://www.suse.com/c/fail-safe-operation-of-sap-hana-suse-extends-its-high-availability-solution/
 
diff --git a/SAPHanaSR-tester.spec b/SAPHanaSR-tester.spec
index fb7094de..03e49b61 100644
--- a/SAPHanaSR-tester.spec
+++ b/SAPHanaSR-tester.spec
@@ -19,7 +19,7 @@ License:        GPL-2.0
 Group:          Productivity/Clustering/HA
 AutoReqProv:    on
 Summary:        Test suite for SAPHanaSR clusters
-Version:        1.2.7
+Version:        1.2.8
 Release:        0
 Url:            https://www.suse.com/c/fail-safe-operation-of-sap-hana-suse-extends-its-high-availability-solution/
 
diff --git a/man-tester/SAPHanaSR-testCluster.8 b/man-tester/SAPHanaSR-testCluster.8
index 553a2bb7..8762f45c 100644
--- a/man-tester/SAPHanaSR-testCluster.8
+++ b/man-tester/SAPHanaSR-testCluster.8
@@ -3,7 +3,7 @@
 .TH SAPHanaSR-testCluster 8 "20 Nov 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
-SAPHanaSR-testCluster \- Run functional testing for SAPHanaSR clusters.
+SAPHanaSR-testCluster \- Run functional tests for SAPHanaSR clusters.
 .PP
 .\"
 .SH SYNOPSIS
@@ -78,7 +78,8 @@ Usage, syntax or execution errors.
 The functional test "nop" is performed on the Linux cluster defined in
 properties_q42.json, nodes are node1 and node2.
 A dedicated working directory and logfile for this test is used.
-See also manual page SAPHanaSR-tester(7) and SAPHanaSR-tests-syntax(7).
+See also manual page SAPHanaSR-tester(7), SAPHanaSR-tests-syntax(5),
+SAPHanaSR-tests-angi-ScaleUp(7) and SAPHanaSR-tests-description(7).
 .PP
 .RS 2
 # mkdir ~/test_nop; cd ~/test_nop
@@ -148,7 +149,9 @@ TODO
 .\"
 .SH REQUIREMENTS
 .\"
-See the REQUIREMENTS section in SAPHanaSR-tester(7).
+See the REQUIREMENTS section in SAPHanaSR-tester(7) and SAPHanaSR-angi(7).
+Of course, HANA database and Linux cluster have certain requirements.
+Please refer to the product documentation.
 .PP
 .\"
 .SH BUGS
@@ -158,7 +161,8 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .PP
 .\"
 .SH SEE ALSO
-\fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-tests-syntax\fP(7) ,
+\fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-tests-syntax\fP(5) ,
+\fBSAPHanaSR-tests-description\fP(7) ,
 \fBSAPHanaSR-tests-angi-ScaleUp\fP(7) , \fBSAPHanaSR-tests-angi-ScaleOut\fP(7) ,
 \fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) ,
 \fBcrm_mon\fP(8) , \fBcrm\fP(8) , \fBcs_clusterstate\fP(8)
@@ -169,7 +173,7 @@ F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2023 SUSE Linux GmbH, Germany.
+(c) 2023 SUSE LLC
 .br
 The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man-tester/SAPHanaSR-tester.7 b/man-tester/SAPHanaSR-tester.7
index dd0fbdb7..9cb443d3 100644
--- a/man-tester/SAPHanaSR-tester.7
+++ b/man-tester/SAPHanaSR-tester.7
@@ -63,14 +63,14 @@ See manual page SAPHanaSR-tests-syntax(5) for details, see also example below.
 \fB*\fP Processing:
 
 .\" TODO SAPHanaSR-testCluster
-.\" TODO shell scripts shiped with SAPhanaSR-tester, e.g. test_
+.\" TODO shell scripts shiped with SAPhanaSR-tester, e.g. sct_test_
 .\" TODO custom scripts and test automation frameworks
-See manual page SAPHanaSR-testCluster(8).
+See manual page SAPHanaSR-testCluster(8) and SAPHanaSR-tests-description(7).
 
 \fB*\fP Output: Test results 
 
 .\" TODO output of SAPHanaSR-testCluster
-See manual page SAPHanaSR-testCluster(8).
+See manual page SAPHanaSR-testCluster(8) and SAPHanaSR-tests-description(7).
 .PP
 .\"
 .SH EXAMPLES
@@ -146,8 +146,9 @@ Note: Never do this on production systems.
 \fB*\fR Showing predefined functional scale-up test cases.
 .PP
 The predefined functional tests for the SAPHanaSR-angi scale-up scenario are
-shown. See manual page SAPHanaSR-tests-angi-ScaleUp(7) and
-SAPHanaSR-testCluster(8) for how to run this tests.
+shown. See also manual page SAPHanaSR-tests-angi-ScaleUp(7). See manual page
+SAPHanaSR-tests-description(7) and SAPHanaSR-testCluster(8) for how to run this
+tests.
 .PP
 .RS 2
 # ls /usr/share/SAPHanaSR-tester/json/angi-ScaleUp/*.json | \\
@@ -236,6 +237,7 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .\"
 .SH SEE ALSO
 \fBSAPHanaSR-testCluster\fP(8) , \fBSAPHanaSR-tests-syntax\fP(5) ,
+\fBSAPHanaSR-tests-description\fP(7) ,
 \fBSAPHanaSR-tests-angi-ScaleUp\fP(7) , \fBSAPHanaSR-tests-angi-ScaleOut\fP(7) ,
 \fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) , \fBcrm_mon\fP(8) ,
 \fBssh-keygen\fP(1) , \fBssh-copy-id\fP(1) ,
@@ -252,7 +254,7 @@ F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2023 SUSE Linux GmbH, Germany.
+(c) 2023 SUSE LLC
 .br
 The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man-tester/SAPHanaSR-tests-angi-ScaleOut.7 b/man-tester/SAPHanaSR-tests-angi-ScaleOut.7
index fea9965b..1cf36f20 100644
--- a/man-tester/SAPHanaSR-tests-angi-ScaleOut.7
+++ b/man-tester/SAPHanaSR-tests-angi-ScaleOut.7
@@ -1,6 +1,6 @@
 .\" Version: 1.001
 .\"
-.TH SAPHanaSR-tests-angi-ScaleOut 7 "20 Nov 2023" "" "SAPHanaSR-angi"
+.TH SAPHanaSR-tests-angi-ScaleOut 7 "20 Dec 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
 SAPHanaSR-tests-angi-ScaleOut \- Functional tests for SAPHanaSR Scale-Out.
@@ -8,101 +8,123 @@ SAPHanaSR-tests-angi-ScaleOut \- Functional tests for SAPHanaSR Scale-Out.
 .\"
 .SH DESCRIPTION
 .PP
-Functional test are shipped for scale-out scenarios. This tests could be run
-out-of-the-box. The test cases are defined in dedicated files.
-See manual page SAPHanaSR-tests-syntax(5) for syntax details.
+Functional test are shipped for the scale-out ERP scenario. This tests could
+be run out-of-the-box. The test cases are defined in dedicated files.
+See manual page SAPHanaSR-tests-syntax(5) for syntax details. Details like
+performed steps or expected behaviour of cluster and HANA are explained in
+SAPHanaSR-tests-description(7).
 
-Entry point for all predefined tests is a clean and idle Linux cluster and a
-clean HANA pair in sync. Same is true for the final state.
-See manual page SAPHanaSR_maintenance_examples(7) for detecting the correct
-status and watching changes near real-time.
+Each test can be executed by running the command SAPHanaSR-testCluster with
+appropriate parameters. See manual page SAPHanaSR-testCluster(8).
 .PP
-Predefined functional tests for scale-out overwiev
+Predefined functional tests for scale-out ERP overwiev:
 .TP
-block_manual_takeover
-blocked manual takeover, for susTkOver.py
+\fBblock_manual_takeover\fP
+Blocked manual takeover, for susTkOver.py.
 .TP
-block_sr_and_freeze_prim_master_nfs
-block HANA SR and freeze HANA NFS on primary master node
+\fBblock_sr_and_freeze_prim_master_nfs\fP
+Block HANA SR and freeze HANA NFS on primary master node (not yet implemented).
 .TP
-block_sr_and_freeze_prim_site_nfs
-block HANA SR and freeze HANA NFS on primary site
+\fBblock_sr_and_freeze_prim_site_nfs\fP
+Block HANA SR and freeze HANA NFS on primary site (not yet implemented).
 .TP
-free_log_area
-free HANA log area on primary site
+\fBfree_log_area\fP
+Free HANA log area on primary site.
 .TP
-freeze_prim_master_nfs
-freeze HANA NFS on primary master node
+\fBfreeze_prim_master_nfs\fP
+Freeze HANA NFS on primary master node.
 .TP
-freeze_prim_site_nfs
-freeze HANA NFS on primary site
+\fBfreeze_prim_site_nfs\fP
+Freeze HANA NFS on primary site.
 .TP
-kill_prim_indexserver
-Kill primary master indexserver, for susChkSrv.py
+\fBfreeze_secn_site_nfs\fP
+Freeze HANA NFS on secondary site (not yet implemented).
 .TP
-kill_prim_inst
-Kill primary master instance
+\fBkill_prim_indexserver\fP
+Kill primary master indexserver, for susChkSrv.py.
 .TP
-kill_prim_node
-Kill primary master node
+\fBkill_prim_inst\fP
+Kill primary master instance.
 .TP
-kill_prim_worker_indexserver
-Kill primary worker indexserver, for susChkSrv.py
+\fBkill_prim_node\fP
+Kill primary master node.
 .TP
-kill_prim_worker_inst
-Kill primary worker instance
+\fBkill_prim_site\fP
+Kill secondary site nodes (not yet implemented).
 .TP
-kill_prim_worker_node
-Kill primary worker node
+\fBkill_prim_worker_indexserver\fP
+Kill primary worker indexserver, for susChkSrv.py.
 .TP
-kill_secn_indexserver
-Kill secondary master indexserver, for susChkSrv.py
+\fBkill_prim_worker_inst\fP
+Kill primary worker instance.
 .TP
-kill_secn_inst
-Kill secondary master instance
+\fBkill_prim_worker_node\fP
+Kill primary worker node.
 .TP
-kill_secn_node
-Kill secondary master node
+\fBkill_secn_indexserver\fP
+Kill secondary master indexserver, for susChkSrv.py.
 .TP
-kill_secn_worker_inst
-Kill secondary worker instance
+\fBkill_secn_inst\fP
+Kill secondary master instance.
 .TP
-kill_secn_worker_node
-Kill secondary worker node
+\fBkill_secn_node\fP
+Kill secondary master node.
 .TP
-maintenance_cluster_turn_hana
-maintenance procedure, manually turning HANA sites 
+\fBkill_secn_worker_inst\fP
+Kill secondary worker instance.
 .TP
-maintenance_with_standby_nodes
-standby+online secondary then standby+online primary
+\fBkill_secn_worker_node\fP
+Kill secondary worker node.
 .TP
-nop
-no operation - check, wait and check again (stability check)
+\fBkill_secn_site\fP
+Kill secondary site nodes (not yet implemented).
 .TP
-restart_cluster
-
+\fBmaintenance_cluster_turn_hana\fP
+Maintenance procedure, manually turning HANA sites.
 .TP
-restart_cluster_hana_running
-
+\fBmaintenance_with_standby_nodes\fP
+Maintenance procedure, standby+online secondary then standby+online primary (not yet implemented).
 .TP
-restart_cluster_turn_hana
-
+\fBnop\fP
+No operation - check, wait and check again (stability check).
+.TP
+\fBregister_prim_cold_hana\fP
+Stop cluster, do manual takeover, leave former primary down and unregistered, start cluster
+(not yet implemented).
+.TP
+\fBrestart_cluster\fP
+Stop and restart cluster and HANA
+.TP
+\fBrestart_cluster_hana_running\fP
+Stop and restart cluster, keep HANA running.
 .TP
-standby_primary_node TODO
-standby primary node (and online again)
+\fBrestart_cluster_turn_hana\fP
+Stop cluster and HANA, takeover HANA, start cluster.
 .TP
-standby_secondary_node TODO
-standby secondary node (and online again)
+\fBstandby_prim_node\fP
+Standby primary master node and online again.
+.TP
+\fBstandby_secn_node\fP
+Standby secondary master node and online again.
+.TP
+\fBstandby_secn_worker_node\fP
+Standby secondary worker node and online again.
 .RE
 .PP
 .\"
 .SH EXAMPLES
 .PP
+* List tests for SAPHanaSR-angi scale-out ERP scenarios
+.PP
+.RS 2
+# ls /usr/share/SAPHanaSR-tester/json/angi-ScaleOut/
+.RE
+.PP
 .\"
 .SH FILES
 .TP
-/usr/share/SAPHanaSR-tester/json/angi-ScaleOu/
-functional tests for SAPHanaSR-angi scale-out scenarios.
+/usr/share/SAPHanaSR-tester/json/angi-ScaleOut/
+functional tests for SAPHanaSR-angi scale-out ERP scenarios.
 .TP
 /usr/bin/sct_test_*
 shell scripts for un-easy tasks on the cluster nodes.
@@ -110,7 +132,9 @@ shell scripts for un-easy tasks on the cluster nodes.
 .\"
 .SH REQUIREMENTS
 .PP
-See the REQUIREMENTS section in SAPHanaSR-tester(7).
+See the REQUIREMENTS section in SAPHanaSR-tester(7) and SAPHanaSR-angi(7).
+Of course, HANA database and Linux cluster have certain requirements.
+Please refer to the product documentation.
 .\"
 .SH BUGS
 In case of any problem, please use your favourite SAP support process to open
@@ -120,7 +144,8 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .\"
 .SH SEE ALSO
 \fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-testCluster\fP(8) ,
-\fBSAPHanaSR-tests-angi-ScaleUp\fP(7) ,  \fBSAPHanaSR-tests-syntax\fP(5) ,
+\fBSAPHanaSR-tests-description\fP(7) , \fBSAPHanaSR-tests-syntax\fP(5) ,
+\fBSAPHanaSR-tests-angi-ScaleUp\fP(7) ,
 \fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8)
 .PP
 .\"
@@ -129,7 +154,7 @@ F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2023 SUSE Linux GmbH, Germany.
+(c) 2023 SUSE LLC
 .br
 The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man-tester/SAPHanaSR-tests-angi-ScaleUp.7 b/man-tester/SAPHanaSR-tests-angi-ScaleUp.7
index 2f608571..e18ccffd 100644
--- a/man-tester/SAPHanaSR-tests-angi-ScaleUp.7
+++ b/man-tester/SAPHanaSR-tests-angi-ScaleUp.7
@@ -1,6 +1,6 @@
 .\" Version: 1.001 
 .\"
-.TH SAPHanaSR-tests-angi-ScaleUp 7 "20 Nov 2023" "" "SAPHanaSR-angi"
+.TH SAPHanaSR-tests-angi-ScaleUp 7 "20 Dec 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
 SAPHanaSR-tests-angi-ScaleUp \- Functional tests for SAPHanaSR Scale-Up.
@@ -10,311 +10,88 @@ SAPHanaSR-tests-angi-ScaleUp \- Functional tests for SAPHanaSR Scale-Up.
 .PP
 Functional test are shipped for scale-up scenarios. This tests could be run
 out-of-the-box. The test cases are defined in dedicated files.
-See manual page SAPHanaSR-tests-syntax(5) for syntax details.
-
-Entry point for all predefined tests is a clean and idle Linux cluster and a
-clean HANA pair in sync. Same is true for the final state. 
-See manual page SAPHanaSR_maintenance_examples(7) for detecting the correct
-status and watching changes near real-time.
+See manual page SAPHanaSR-tests-syntax(5) for syntax details. Details like
+performed steps or expected behaviour of cluster and HANA are explained in
+SAPHanaSR-tests-description(7).
 .PP
 Predefined functional tests for scale-up overview:
-.PP
+.TP
 \fBblock_manual_takeover\fP
-.RS 2
-Descr: blocked manual takeover, for susTkOver.py
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See susTkOver.py(7).
-.br
-Expect: Both nodes stay online.
-Both HANA stay online.
-Failed manual takeover attempt is logged in syslog and HANA tracefile.
-SR stays SOK.
-No takeover. No fencing.
-.RE
-.PP
+Blocked manual takeover, for susTkOver.py.
+.TP
 \fBblock_sr\fP
-.RS 2
-Descr: block HANA SR and check SFAIL attribute; unblock to recover
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See susHanaSR.py.(7).
-.br
-Expect: Both nodes stay online.
-Both HANA stay online.
-SR SFAIL and finally SOK.
-No takeover. No fencing.
-.RE
-.PP
+Block HANA SR and check SFAIL attribute; unblock to recover.
+.TP
 \fBblock_sr_and_freeze_prim_fs\fP
-.RS 2
-Descr: block HANA SR and freeze HANA FS on primary master node
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See ocf_suse_SAPHanaFilesystem(7), susHanaSR.py.(7).
-.br
-Expect: Both nodes stay online.
-HANA primary is stopped and finally back online.
-SR SFAIL and finally SOK.
-No takeover. No fencing.
-.RE
-.PP
+Block HANA SR and freeze HANA FS on primary master node.
+.TP
 \fBflup\fP
-.RS 2
-Descr: like nop but very short sleep only - only for checking the test engine
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: Wait and see.
-.br
-Expect: Cluster and HANA are up and running, all good.
-.RE
-.PP
+Like nop but very short sleep, just checking the test engine.
+.TP
 \fBfree_log_area\fP
-.RS 2
-Descr: free HANA log area on primary site
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: Free up HANA transaction log space and log backups.
-.br
-Expect: Cluster and HANA are up and running, all good.
-.RE
-.PP
+Free HANA log area on primary site.
+.TP
 \fBfreeze_prim_fs\fP
-.RS 2
-Descr: freeze HANA FS on primary master node
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See ocf_suse_SAPHanaFilesystem(7).
-.br
-Expect: Primary node fenced and finally started as secondary.
-HANA primary stopped and finally started as secondary.
-HANA secondary becomes finally primary.
-SR SFAIL and finally SOK.
-One takeover. One fence.
-.RE
-.PP
+Freeze HANA FS on primary master node.
+.TP
 \fBkill_prim_indexserver\fP
-.RS 2
-Descr: Kill primary indexserver, for susChkSrv.py
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See susChkSrv.py(7).
-.br
-Expect: Primary node stays online.
-HANA primary stopped and finally started as secondary.
-HANA secondary becomes finally primary.
-SR SFAIL and finally SOK.
-One takeover. No fencing (for action_on_lost=kill).
-.RE
-.PP
+Kill primary indexserver, for susChkSrv.py.
+.TP
 \fBkill_prim_inst\fP
-.RS 2
-Descr: Kill primary instance
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: HDB kill
-.br
-Expect: Primary node stays online.
-HANA primary stopped and finally started as secondary.
-HANA secondary becomes finally primary.
-SR SFAIL and finally SOK.
-One takeover. No fencing.
-.RE
-.PP
+Kill primary instance.
+.TP
 \fBkill_prim_node\fP
-.RS 2
-Descr: Kill primary node
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: systemctl reboot --force
-.br
-Expect: Primary node fenced and finally started as secondary.
-HANA primary stopped and finally started as secondary.
-HANA secondary becomes finally primary.
-SR SFAIL and finally SOK.
-One takeover. One fencing.
-.RE
-.PP
+Kill primary node.
+.TP
 \fBkill_secn_indexserver\fP
-.RS 2
-Descr: Kill secondary indexserver, for susChkSrv.py
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See susChkSrv.py(7).
-.br
-Expect: HANA secondary stopped and finally online.
-HANA primary stays online.
-SR SFAIL and finally SOK.
-No takeover. No fencing (for action_on_lost=kill).
-.RE
-.PP
+Kill secondary indexserver, for susChkSrv.py.
+.TP
 \fBkill_secn_inst\fP
-.RS 2
-Descr: Kill secondary instance
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: HDB kill
-.br
-Expect: HANA secondary stopped and finally online.
-HANA primary stays online.
-SR SFAIL and finally SOK.
-No takeover. No fencing.
-.RE
-.PP
+Kill secondary instance.
+.TP
 \fBkill_secn_node\fP
-.RS 2
-Descr: Kill secondary node
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: systemctl reboot --force
-.br
-Expect: Secondary node fenced and finally online.
-HANA primary stays online.
-SR SFAIL and finally SOK.
-No takeover. One fencing.
-.RE
-.PP
+Kill secondary node.
+.TP
 \fBmaintenance_cluster_turn_hana\fP
-.RS 2
-Descr: maintenance procedure, manually turning HANA sites
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See SAPHanaSR_maintenance_examples(7), https://www.suse.com/c/sap-hana-maintenance-suse-clusters/ .
-.br
-Expect: Both nodes stay online.
-HANA primary stopped and finally started as secondary.
-HANA secondary becomes finally primary by manual takeover.
-SR SFAIL and finally SOK. 
-One takeover. No fencing.
-.RE
-.PP
+Maintenance procedure, manually turning HANA sites.
+.TP
 \fBmaintenance_with_standby_nodes\fP
-.RS 2
-Descr: standby+online secondary then standby+online primary
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: See SAPHanaSR_maintenance_examples(7.
-.br
-Expect:  Both nodes stay online.
-HANA primary stopped and finally started as secondary.
-HANA secondary becomes finally primary.
-SR SFAIL and finally SOK.
-One takeover. No fencing.
-.RE
-.PP
+Maintenance procedure, standby+online secondary then standby+online primary.
+.TP
 \fBnop\fP
-.RS 2
-Descr: no operation - check, wait and check again (stability check)
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: Wait and see.
-.br
-Expect: Cluster and HANA are up and running, all good.
-.RE
-.PP
+No operation - check, wait and check again (stability check).
+.TP
+\fBregister_prim_cold_hana\fP
+Stop cluster, do manual takeover, leave former primary down and unregistered, start cluster (not yet implementeed). 
+.TP
 \fBrestart_cluster_hana_running\fP
-.RS 2
-Descr:
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: 
-.br
-Expect: Both nodes stay online.
-
-No takeover. No fencing.
-.RE
-.PP
+Stop and restart cluster, keep HANA running.
+.TP
 \fBrestart_cluster\fP
-.RS 2
-Descr:
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test:
-.br
-Expect: Both nodes stay online.
-
-No takeover. No fencing.
-.RE
-.PP
+Stop and restart cluster and HANA.
+.TP
 \fBrestart_cluster_turn_hana\fP
-.RS 2
-Descr:
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test:
-.br
-Expect: Both nodes stay online.
-
-One takeover. No fencing.
-.RE
+Stop cluster and HANA, manually start and takeover HANA, start cluster.
 .PP
 \fBsplit_brain_prio\fP
-.RS 2
-Descr: Network split-brain with priority fencing
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test:
-.br
-Expect: Secondary node fenced and finally online.
-Primary node stays online.
-HANA primary stays online.
-SR SFAIL and finally SOK.
-No takeover. One fencing.
-.RE
+Network split-brain with priority fencing.
+.TP
+\fBstandby_prim_node\fP
+Set primary node standby and online again.
+.TP
+\fBstandby_secn_node\fP
+Set secondary node standby and online again.
 .PP
-\fBstandby_primary_node\fP
-.RS 2
-Descr: Set primary node standby and online again
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: crm node standby <node>; crm node online <node>
-.br
-Expect: Both nodes aty online.
-Primary node standby and finally back online.
-HANA primary stopped and finally started as secondary.
-HANA secondary finally primary by takeover.
-SR SFAIL and finally SOK.
-One takeover. No fencing.
-.RE
+.\"
+.SH EXAMPLES
+.PP
+* List tests for SAPHanaSR-angi scale-up scenarios
 .PP
-\fBstandby_secondary_node\fP
 .RS 2
-Descr: Set secondary node standby and online again
-.br
-Prereq: Cluster and HANA are up and running, all good.
-.br
-Test: crm node standby <node>; crm node online <node>
-.br
-Expect: Secondary node standby and finally online.
-HANA primary stays online.
-HANA secondary stopped and finally started.
-SR SFAIL and finally SOK. No takeover. No fencing.
+# ls /usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
 .RE
 .PP
 .\"
-.SH EXAMPLES
-.PP
-.\"
 .SH FILES
 .\"
 .TP
@@ -328,6 +105,8 @@ shell scripts for un-easy tasks on the cluster nodes.
 .SH REQUIREMENTS
 .\"
 See the REQUIREMENTS section in SAPHanaSR-tester(7) and SAPHanaSR-angi(7).
+Of course, HANA database and Linux cluster have certain requirements.
+Please refer to the product documentation.
 .PP
 .\"
 .SH BUGS
@@ -338,7 +117,8 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .\"
 .SH SEE ALSO
 \fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-testCluster\fP(8) ,
-\fBSAPHanaSR-tests-angi-ScaleOut\fP(7) , \fBSAPHanaSR-tests-syntax\fP(5) ,
+\fBSAPHanaSR-tests-description\fP(7) , \fBSAPHanaSR-tests-syntax\fP(5) ,
+\fBSAPHanaSR-tests-angi-ScaleOut\fP(7) ,
 \fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8)
 .PP
 .\"
@@ -347,7 +127,7 @@ F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2023 SUSE Linux GmbH, Germany.
+(c) 2023 SUSE LLC
 .br
 The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man-tester/SAPHanaSR-tests-basic-cluster.7 b/man-tester/SAPHanaSR-tests-basic-cluster.7
index 14c3f91a..1cd9f603 100644
--- a/man-tester/SAPHanaSR-tests-basic-cluster.7
+++ b/man-tester/SAPHanaSR-tests-basic-cluster.7
@@ -23,11 +23,23 @@ The checks outlined here are by no means complete.
 Neverteless, at least this checks should be performed before doing functional
 tests.
 .PP
+\fB*\fR Checking access to update channels and pending patches. 
+.PP
+The accessible update channels are shown. Also pending patches are listed.
+Do this on all Linux cluster nodes.
+See manual page zypper(8).
+.PP
+.RS 2
+# zypper lr
+.br
+# zypper lp
+.RE
+.PP
 \fB*\fR Checking systemd integration and OS settings for SAP HANA.
 .PP
 Basic OS features time and name resolution as well as HANA disk space are
 checked. Integration of SAP hostagent and SAP HANA database with systemd are
-checked. OS settings for HANA are checked.
+checked. OS settings for HANA are checked. Do this on all Linux cluster nodes.
 Cluster nodes are "node1" and "node2", HANA SID is "HA1", instance
 number is "85". Do this on all Linux cluster nodes.
 See manual page chronyc(8) and saptune(8).
@@ -47,6 +59,7 @@ See manual page chronyc(8) and saptune(8).
 \fB*\fR Checking for errors in the system logs.
 .PP
 Known error patterns are looked up in the system log.
+Do this on all Linux cluster nodes.
 See manual page cs_show_error_patterns(8).
 .PP
 .RS 2
@@ -125,7 +138,8 @@ The Linux sudo rules are checked for needed permissions.
 The HANA global.ini is checked for SUSE HA/DR provider hook scripts. The HANA
 nameserver tracefiles are checked whether the hook scripts have been loaded.
 SID is HA1, instance number is 85. Do this on all Linux cluster nodes. See
-manual page susHanaSR.py(7), susTkOver.py(7) and susChkSrv.py(7).
+manual page susHanaSR.py(7), susTkOver.py(7), susChkSrv.py(7) and
+SAPHanaSR-hookHelper(8).
 .PP
 .RS 2
 # sudo -U ha1adm -l | \\
@@ -181,6 +195,8 @@ path to HANA tracefiles
 .SH REQUIREMENTS
 .\"
 See the REQUIREMENTS section in SAPHanaSR-tester(7) and SAPHanaSR-angi(7).
+Of course, the Linux cluster has certain requirements.
+Please refer to the product documentation.
 .PP
 .\"
 .SH BUGS
@@ -193,7 +209,7 @@ Please report any other feedback and suggestions to feedback@suse.com.
 \fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-angi\fP(7) ,
 \fBSAPHanaSR_basic_cluster\fP(7) , \fBSAPHanaSR-ScaleOut_basic_cluster\fP(7) ,
 \fBsusHanaSR.py\fP(7) , \fBsusTkOver.py\fP(7) , \fBsusChkSrv.py\fP(7) ,
-\fBcrm\fP(8) , \fBcrm_verify\fP(8) , \fBstonith_admin\fP(8) ,
+\fBcrm\fP(8) , \fBcrm_verify\fP(8) , \fBcrm_mon\fP(8) , \fBstonith_admin\fP(8) ,
 \fBcs_show_error_patterns\fP(8) , \fBcs_sum_base_config\fP(8) ,
 \fBcs_show_sbd_devices\fP(8) , \fBsbd\fP(8) , \fBstonith_sbd\fP(8) ,
 \fBsaptune\fP(8) , \fBchronyc\fP(8) , \fBsystemctl\fP(8) , \fBhosts\fP(5) ,
@@ -213,7 +229,7 @@ F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2023 SUSE Linux GmbH, Germany.
+(c) 2023 SUSE LLC
 .br
 The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man-tester/SAPHanaSR-tests-description.7 b/man-tester/SAPHanaSR-tests-description.7
new file mode 100644
index 00000000..26e9848a
--- /dev/null
+++ b/man-tester/SAPHanaSR-tests-description.7
@@ -0,0 +1,705 @@
+.\" Version: 1.001 
+.\"
+.TH SAPHanaSR-tests-description 7 "04 Jan 2024" "" "SAPHanaSR-angi"
+.\"
+.SH NAME
+SAPHanaSR-tests-description \- Functional tests for SAPHanaSR.
+.PP
+.\"
+.SH DESCRIPTION
+.PP
+Functional test are shipped for different scenarios. This tests could be run
+out-of-the-box. The test cases are defined in dedicated files.
+See manual page SAPHanaSR-tests-syntax(5) for syntax details. Tests for
+SAPHanaSR-angi scale-up scenarios are listed in SAPHanaSR-tests-angi-ScaleUp(7),
+for SAPHanaSR-angi scale-out ERP scenarios in SAPHanaSR-tests-angi-ScaleOut(7). 
+
+Entry point for all predefined tests is a clean and idle Linux cluster and a
+clean HANA pair in sync. Same is true for the final state. 
+See manual page SAPHanaSR_maintenance_examples(7) for detecting the correct
+status and watching changes near real-time.
+
+Each test can be executed by running the command SAPHanaSR-testCluster with
+appropriate parameters. See manual page SAPHanaSR-testCluster(8).
+.PP
+Predefined functional tests:
+.PP
+\fBblock_manual_takeover\fP
+.RS 2
+Descr: Blocked manual takeover, for susTkOver.py.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See susTkOver.py(7).
+.br
+Expect: Both nodes stay online.
+Both HANA stay online.
+Failed manual takeover attempt is logged in syslog and HANA tracefile.
+SR stays SOK.
+No takeover. No fencing.
+.br
+Comment: Admin mistake.
+.RE
+.PP
+\fBblock_sr\fP
+.RS 2
+Descr: Block HANA SR and check SFAIL attribute; unblock to recover.
+.br
+Topology: ScaleUp, ScaleOut (not yet implemented).
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See susHanaSR.py.(7).
+.br
+Expect: All nodes stay online.
+Both HANA stay online.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBblock_sr_and_freeze_prim_fs\fP
+.RS 2
+Descr: Block HANA SR and freeze HANA FS on primary node.
+.br
+Topology: ScaleUp.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7), susHanaSR.py.(7).
+.br
+Expect: Both nodes stay online.
+HANA primary is stopped and finally back online.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBblock_sr_and_freeze_prim_master_nfs\fP
+.RS 2
+Descr: Block HANA SR and freeze HANA NFS on primary master node
+(not yet implemented).
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7), susHanaSR.py.(7).
+.br
+Expect: All nodes stay online.
+HANA primary is stopped and finally back online.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBblock_sr_and_freeze_prim_site_nfs\fP
+.RS 2
+Descr: Block HANA SR and freeze HANA NFS on primary site
+(not yet implemented).
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7), susHanaSR.py.(7).
+.br
+Expect: All nodes stay online.
+HANA primary is stopped and finally back online.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBflup\fP
+.RS 2
+Descr: Like nop but very short sleep, just checking the test engine.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: Wait and see.
+.br
+Expect: Cluster and HANA are up and running, all good.
+.br
+Comment: Just housekeeping.
+.RE
+.PP
+\fBfree_log_area\fP
+.RS 2
+Descr: Free HANA log area on primary site.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: Free up HANA transaction log space and log backups.
+.br
+Expect: Cluster and HANA are up and running, all good.
+.br
+Comment: Just housekeeping.
+.RE
+.PP
+\fBfreeze_prim_fs\fP
+.RS 2
+Descr: Freeze HANA FS on primary node.
+.br
+Topology: ScaleUp.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7).
+.br
+Expect: Primary node fenced and finally started as secondary.
+HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. One fence.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBfreeze_prim_master_nfs\fP
+.RS 2
+Descr: Freeze HANA NFS on primary master node.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7).
+.br
+Expect: Primary master node fenced, primary worker instance stopped.
+HANA finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. One fence. 
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBfreeze_prim_site_nfs\fP
+.RS 2
+Descr: Freeze HANA NFS on primary site.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7).
+.br
+Expect: Primary master an worker node fenced.
+HANA finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. One fence. 
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBfreeze_secn_site_nfs\fP
+.RS 2
+Freeze HANA NFS on secondary site.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See ocf_suse_SAPHanaFilesystem(7).
+.br
+Expect: Primary site keeps running.
+HANA secondary site restarted.
+SR SFAIL and finally SOK.
+No takeover. No fence.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBkill_prim_indexserver\fP
+.RS 2
+Descr: Kill primary indexserver, for susChkSrv.py.
+On scale-out, kill primary master indexserver.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See susChkSrv.py(7).
+.br
+Expect: Primary node stays online.
+HANA primary (master) stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. No fencing (for action_on_lost=kill).
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_prim_inst\fP
+.RS 2
+Descr: Kill primary instance.
+On scale-out, kill primary master instance.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: HDB kill
+.br
+Expect: Primary (master) node stays online.
+HANA primary (master) stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. No fencing.
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_prim_node\fP
+.RS 2
+Descr: Kill primary node.
+On scale-out, kill primary master node.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: systemctl reboot --force
+.br
+Expect: Primary (master) node fenced and finally started as secondary.
+HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. One fencing.
+.br
+Comment: Node failure, main cluster case.
+.RE
+.PP
+\fBkill_prim_worker_indexserver\fP
+.RS 2
+Descr: Kill primary worker indexserver, for susChkSrv.py.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See susChkSrv.py(7).
+.br
+Expect: HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. No fencing (for action_on_lost=kill).
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_prim_worker_inst\fP
+.RS 2
+Descr: Kill primary worker instance.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: HDB kill
+.br
+Expect: HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. No fencing.
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_prim_worker_node\fP
+.RS 2
+Descr: Kill primary worker node.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: systemctl reboot --force
+.br
+Expect: Primary worker node fenced. 
+HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. One fencing.
+.br
+Comment: Node failure, main cluster case.
+.RE
+.PP
+\fBkill_secn_indexserver\fP
+.RS 2
+Descr: Kill secondary indexserver, for susChkSrv.py.
+On scale-out, kill secondary master indexserver.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See susChkSrv.py(7).
+.br
+Expect: HANA secondary stopped and finally online.
+HANA primary stays online.
+SR SFAIL and finally SOK.
+No takeover. No fencing (for action_on_lost=kill).
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_secn_inst\fP
+.RS 2
+Descr: Kill secondary instance.
+On scale-out, kill secondary master instance.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: HDB kill
+.br
+Expect: HANA secondary stopped and finally online.
+HANA primary stays online.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_secn_node\fP
+.RS 2
+Descr: Kill secondary node.
+On scale-out, kill secondary master node.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: systemctl reboot --force
+.br
+Expect: Secondary (master) node fenced and finally online.
+HANA primary stays online.
+SR SFAIL and finally SOK.
+No takeover. One fencing.
+.br
+Comment: Node failure, main cluster case.
+.RE
+.PP
+\fBkill_secn_worker_inst\fP
+.RS 2
+Descr: Kill secondary worker instance.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test:
+.br
+Expect:
+
+HANA primary stays online.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Application failure, main cluster case.
+.RE
+.PP
+\fBkill_secn_worker_node\fP
+.RS 2
+Descr: Kill secondary worker node.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: systemctl reboot --force
+.br
+Expect: Secondary worker node fenced and finally online.
+HANA primary stays online.
+SR SFAIL and finally SOK.
+No takeover. One fencing.
+.br
+Comment: Node failure, main cluster case.
+.RE
+.PP
+\fBmaintenance_cluster_turn_hana\fP
+.RS 2
+Descr: Maintenance procedure, manually turning HANA sites.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See SAPHanaSR_maintenance_examples(7), https://www.suse.com/c/sap-hana-maintenance-suse-clusters/ .
+.br
+Expect: All nodes stay online.
+HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary by manual takeover.
+SR SFAIL and finally SOK. 
+One takeover. No takeover by cluster. No fencing.
+.br
+Comment: Main admin procedure.
+.RE
+.PP
+\fBmaintenance_with_standby_nodes\fP
+.RS 2
+Descr: standby+online secondary then standby+online primary
+.br
+Topology: ScaleUp.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: See SAPHanaSR_maintenance_examples(7).
+.br
+Expect: All nodes stay online.
+HANA primary stopped and finally started as secondary.
+HANA secondary becomes finally primary.
+SR SFAIL and finally SOK.
+One takeover. No fencing.
+.br
+Comment: Sub-optimal admin procedure.
+.RE
+.PP
+\fBnop\fP
+.RS 2
+Descr: No operation - check, wait and check again (stability check).
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: Wait and see.
+.br
+Expect: Cluster and HANA are up and running, all good.
+.br
+Comment: Main cluster case.
+.RE
+.PP
+\fBregister_prim_cold_hana\fP
+.RS 2
+Descr: Stop cluster, do manual takeover, leave former primary down and unregistered, start cluster.
+.br
+Topology: ScaleUp, ScaleOut (not yet implemented).
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test:
+.br
+Expect: All nodes stay online.
+HANA primary stopped and finally started as secondary.
+HANA secondary stopped and finally started as primary.
+SR SFAIL and finally SOK.
+One takeover. No takeover by cluster. No fencing.
+.br
+Comment: Admin mistake.
+.RE
+.PP
+\fBrestart_cluster_hana_running\fP
+.RS 2
+Descr: Stop and restart cluster, keep HANA running.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: crm maintenance on;
+crm cluster run "crm cluster stop";
+crm cluster run "crm cluster start";
+crm resource refresh <cln_topology>;
+crm resource refresh <msl_controller>;
+crm resource maintenance off;
+.br
+Expect: All nodes stay online.
+Cluster stopped and restarted.
+Both HANA keep running.
+SR stays SOK.
+No takeover. No fencing.
+.br
+Comment: Main admin procedure.
+.RE
+.PP
+\fBrestart_cluster\fP
+.RS 2
+Descr: Stop and restart cluster and HANA.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: crm cluster run "crm cluster stop";
+sapcontrol ... StartSystem;
+sapcontrol ... StartSystem;
+crm cluster run "crm cluster start";
+.br
+Expect: All nodes stay online.
+Cluster stopped and restarted.
+Both HANA stopped and manually restarted.
+SR SFAIL and finally SOK.
+No takeover. No fencing.
+.br
+Comment: Sub-optimal admin procedure.
+.RE
+.PP
+\fBrestart_cluster_turn_hana\fP
+.RS 2
+Descr: Stop cluster and HANA, manually start and takeover HANA, start cluster.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: Stop cluster and HANA, manually start HANA and do takeover, restart cluster.
+No resource maintenance, no resource refresh.
+.br
+Expect: All nodes stay online.
+Both HANA stopped.
+HANA primary finally started as secondary.
+HANA secondary becomes finally primary by manual takeover.
+SR SFAIL and finally SOK. 
+One takeover. No takeover by cluster. No fencing.
+.br
+Comment: Sub-optimal admin procedure, challenge for susHanaSR.py.
+.RE
+.PP
+\fBsplit_brain_prio\fP
+.RS 2
+Descr: Network split-brain with priority fencing.
+.br
+Topology: ScaleUp.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: iptables -I INPUT -s <node> -j DROP
+.br
+Expect: Secondary node fenced and finally online.
+Primary node stays online.
+HANA primary stays online.
+SR SFAIL and finally SOK.
+No takeover. One fencing.
+.br
+Comment: Infrastructure failure, main cluster case.
+.RE
+.PP
+\fBstandby_prim_node\fP
+.RS 2
+Descr: Set primary node standby and online again.
+On scale-out, standby primary master node and online again.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: crm node standby <node>; crm node online <node>
+.br
+Expect: All nodes stay online.
+Primary (master) node standby and finally back online.
+HANA primary stopped and finally started as secondary.
+HANA secondary finally primary by takeover.
+SR SFAIL and finally SOK.
+One takeover. No fencing.
+.br
+Comment: Admin mistake on scale-out, sub-optimal procedure on scale-up.
+.RE
+.PP
+\fBstandby_secn_node\fP
+.RS 2
+Descr: Set secondary node standby and online again.
+On scale-out, standby secondary master node and online again.
+.br
+Topology: ScaleUp, ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: crm node standby <node>; crm node online <node>
+.br
+Expect: Secondary (master) node standby and finally online.
+HANA primary stays online.
+HANA secondary stopped and finally started.
+SR SFAIL and finally SOK. No takeover. No fencing.
+.br
+Comment: Admin mistake on scale-out, sub-optimal procedure on scale-up.
+.RE
+.PP
+\fBstandby_secn_worker_node\fP
+.RS 2
+Descr: Set secondary worker node standby and online again.
+.br
+Topology: ScaleOut.
+.br
+Prereq: Cluster and HANA are up and running, all good.
+.br
+Test: crm node standby <node>; crm node online <node>
+.br
+Expect: Secondary worker node standby and finally online.
+HANA primary stays online.
+HANA secondary stays online. HANA worker clone_state goes to UNDEFINED and
+finally to DEMOTED.
+SR stays SOK. No takeover. No fencing.
+.br
+Comment: Admin mistake.
+.RE
+.PP
+.\"
+.SH EXAMPLES
+.PP
+* List all shipped tests
+.PP
+.RS 2
+# find /usr/share/SAPHanaSR-tester/json/ -name "*.json" -exec basename {} \\; | sort -u
+.RE
+.PP
+.\"
+.SH FILES
+.\"
+.TP
+/usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
+functional tests for SAPHanaSR-angi scale-up scenarios.
+.TP
+/usr/share/SAPHanaSR-tester/json/angi-ScaleOut/
+functional tests for SAPHanaSR-angi scale-out ERP scenarios.
+.TP
+/usr/bin/sct_test_*
+shell scripts for un-easy tasks on the cluster nodes.
+.PP
+.\"
+.SH REQUIREMENTS
+.\"
+See the REQUIREMENTS section in SAPHanaSR-tester(7) and SAPHanaSR-angi(7).
+Of course, HANA database and Linux cluster also have certain requirements.
+Please refer to the product documentation.
+.PP
+.\"
+.SH BUGS
+In case of any problem, please use your favourite SAP support process to open
+a request for the component BC-OP-LNX-SUSE.
+Please report any other feedback and suggestions to feedback@suse.com.
+.PP
+.\"
+.SH SEE ALSO
+\fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-testCluster\fP(8) ,
+\fBSAPHanaSR-tests-syntax\fP(5) , \fBSAPHanaSR-tests-angi-ScaleUp\fP(7) ,
+\fBSAPHanaSR-tests-angi-ScaleOut\fP(7) , \fBSAPHanaSR-angi\fP(7) ,
+\fBSAPHanaSR-showAttr\fP(8)
+.PP
+.\"
+.SH AUTHORS
+F.Herschel, L.Pinne.
+.PP
+.\"
+.SH COPYRIGHT
+(c) 2023-2024 SUSE LLC
+.br
+The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
+.br
+For details see the GNU General Public License at
+http://www.gnu.org/licenses/gpl.html
+.\"
diff --git a/man-tester/SAPHanaSR-tests-syntax.5 b/man-tester/SAPHanaSR-tests-syntax.5
index fbbd6571..79272ef2 100644
--- a/man-tester/SAPHanaSR-tests-syntax.5
+++ b/man-tester/SAPHanaSR-tests-syntax.5
@@ -29,11 +29,76 @@ SAPHanaSR-tests-angi-ScaleOut(7) for predefined test cases.
 .\"
 Test cases are defined in JSON files. Each test case is described in one file.
 It also can reference to defaults.json for common status definitions.
+
+TODO on first level
+[ test | name | start | comment | steps ]
+.\" TODO comment or remark?
+
+.TP
+\fBtest\fP
+test identifier, unique
+.TP
+\fBname\fP
+test description
+.TP
+\fBstart\fP
+name of step to start the test with
+.TP
+\fBcomment\fP
+comment, just a string
+.TP
+\fBsteps\fP
+test steps, see below
 .PP
-\fB*\fP Test step status
+\fBsteps\fP
+
+TODO
+[ step | name | next | loop | wait | post | comment | <status> ]
+
+.TP
+\fBstep\fP
+step identifier, unique
+.TP
+\fBname\fP
+step description
+.TP
+\fBnext\fP
+name of step to do next
+.TP
+\fBloop\fP
+maximum number of loops to wait and check for status
+.TP
+\fBwait\fP
+how many seconds to wait for each loop TODO
+.TP
+\fBcomment\fP
+comment, just a string
+.TP
+\fBstatus\fP
+status definition, see below
+
+.PP
+\fB*\fP Test step status <status>
+.PP
+Each step contains an expectation for SAPHanaSR attributes, which need to match.
+The attributes are arranged along the CIB and SAPHanaSR-showAttr sections. 
+The 
+
+[ pHost | sHost | pWorker | sWorker | pSite | sSite | pGlobal | sGlobal ]
+
+.TP
+pHost, sHost, pWorker, sWorker
+node attributes
+.TP
+pSite, sSite
+site attributes
+.TP
+pGlobal, sGlobal
+global attributes, not yet implmented
+.PP
+See manual page SAPHanaSR-showAttr(8) for details on that attributes.
 .PP
-Each step contains an expectation for SAPHanaSR attributes, which need to
-match. The step status are:
+Some common status are predefind as defaults:
 .TP
 globalUp
 both sites are up and in sync
@@ -42,19 +107,29 @@ globalDown
 not yet implemented
 .TP
 pHostUp
-host p (expected to be primary before the test starts) is up  
+host p (expected to be primary before the test starts) is up (scale-out: expected primary master node)
+.TP
+pWorkerUp
+worker node p is up (scale-out)
 .TP
 pSiteUp
-site p is up  
+site p is up
 .TP
 sSiteUp
 site s (expected to be secondary before the test starts) is up  
 .TP
 sHostUp
-host s is up  
+host s is up (scale-out: master node)
+.TP
+sWorkerUp
+worker node s is up (scale-out)
 .TP
 pHostDown
-host p is down 
+host p is down (scale-out: master node)
+.TP
+pWorkerDown
+worker node p is down (scale-out)
+not yet implemented
 .TP
 pSiteDown
 site p is down 
@@ -63,7 +138,11 @@ sSiteDown
 site s is down 
 .TP
 sHostDown
-host s is down 
+host s is down (scale-out: master node)
+.TP
+sWorkerDown
+worker node s is down (scale-out)
+not yet implemented
 .PP
 Note: Prefixes "s" and "p" are statically indicating geographical sites, as
 seen at the beginning of a test. If a takeover happens during that test, the
@@ -119,15 +198,87 @@ not like, regular expression
 is
 TODO, the string "None"
 .PP
-\fB*\fP Test step actions
+\fB*\fP Test step action "post"
 .PP
 TODO
+.PP
+action on cluster after step, one of:
+.TP
+bmt
+block manual takeover
+.TP
+cleanup
+cleanup Linux cluster resource failure
+.TP
+kill_prim_worker_node
+kill pirmary worker node (scale-out)
+.TP
+kill_prim_node
+kill pirmary node (scale-out: primary master node)
+.TP
+kill_secn_worker_node
+kill secondary worker node (scale-out)
+.TP
+kill_secn_node
+kill secondary node (scale-out: secondary master node)
+.TP
+kill_prim_inst
+kill pirmary instance (scale-out: primary master instance)
+.TP
+kill_prim_worker_inst
+kill worker pirmary instance (scale-out)
+.TP
+kill_secn_inst
+kill secondary instance (scale-out: secondary master instance)
+.TP
+kill_secn_worker_inst
+kill worker secondary instance (scale-out)
+.TP
+kill_prim_indexserver
+kill primary indexserver (scale-out: primary master indexserver)
 .TP
-post
-action after step, [ bmt | cleanup | spn | ssn | osn | script <script> | kill_... ] 
+kill_secn_indexserver
+kill secondary indexserver (scale-out: secondary master indexserver)
+.TP
+kill_prim_worker_indexserver
+kill primary worker indexserver (scale-out)
+.TP
+kill_secn_worker_indexserver
+kill secondary worker indexserver (scale-out)
+.TP
+simulate_split_brain
+break corosync communcation
+.TP
+spn
+standby primary node (scale-out: primary master)
+.TP
+ssn
+standby secondary node (scale-out: secondary master)
+.TP
+standby_secn_worker_node
+standby secondary worker node (scale-out)
+.TP
+opn
+online primary node (scale-out: primary master)
+.TP
+osn
+online seconary node (scale-out: secondary master)
+.TP
+online_secn_worker_node
+online secondary worker node (scale-out)
+.TP
+script <script>
+execure predefined script
+.TP
+shell <command>
+execute command
+.TP
+sleep <seconds>
+sleep some seconds
 .RE
-See also the EXAMPLES section in manual pages SAPHanaSR-tests-angi-ScaleUp(7)
-and SAPHanaSR-tests-angi-ScaleOut(7).
+.PP
+See also manual pages SAPHanaSR-tests-angi-ScaleUp(7), 
+SAPHanaSR-tests-angi-ScaleOut(7) and SAPHanaSR-tests-description(7).
 .PP
 \fB*\fP Test system properties
 .PP
@@ -152,7 +303,7 @@ TODO
 .br
 }
 
-See also EXAMPLE section in manual page SAPHanaSR-tester(7).
+See also EXAMPLES section in manual page SAPHanaSR-tester(7).
 
 \fB*\fP Test results
 
@@ -166,6 +317,7 @@ TODO
 .\"
 .SH FILES
 .\"
+.TP
 /usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
 functional tests for SAPHanaSR-angi scale-up scenarios.
 .TP
@@ -205,7 +357,7 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .SH SEE ALSO
 \fBSAPHanaSR-tester\fP(7) ,  \fBSAPHanaSR-testCluster\fP(8) ,
 \fBSAPHanaSR-tests-angi-ScaleUp\fP(7) , \fBSAPHanaSR-tests-angi-ScaleOut\fP(7) ,
-\fBSAPHanaSR-showAttr\fP(8) ,
+\fBSAPHanaSR-tests-definition\fP(7) , \fBSAPHanaSR-showAttr\fP(8) ,
 .br
 https://documentation.suse.com/sbp/sap/ ,
 .br
@@ -219,7 +371,7 @@ F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2023 SUSE Linux GmbH, Germany.
+(c) 2023 SUSE LLC
 .br
 The package SAPHanaSR-tester comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man/SAPHanaSR-ScaleOut.7 b/man/SAPHanaSR-ScaleOut.7
index 8ff6cb09..99006ab5 100644
--- a/man/SAPHanaSR-ScaleOut.7
+++ b/man/SAPHanaSR-ScaleOut.7
@@ -1,10 +1,9 @@
 .\" Version: 1.001 
 .\"
-.TH SAPHanaSR-ScaleOut 7 "31 Oct 2023" "" "SAPHanaSR-angi"
+.TH SAPHanaSR-ScaleOut 7 "18 Dec 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
-SAPHanaSR-ScaleOut \- Tools for automating SAP HANA system replication in
-scale-out setups.
+SAPHanaSR-ScaleOut \- Automating SAP HANA system replication in scale-out setups.
 .PP
 .\"
 .SH DESCRIPTION
@@ -13,7 +12,7 @@ scale-out setups.
 .PP
 This manual page SAPHanaSR-ScaleOut provides information for setting up 
 and managing automation of SAP HANA system replication (SR) in scale-out setups.
-For scale-up, please refer to SAPHanaSR(7).
+For scale-up, please refer to SAPHanaSR(7), see also SAPHanaSR-angi(7).
 .PP
 System replication will help to replicate the database data from one site to
 another site in order to compensate for database failures. With this mode of
diff --git a/man/SAPHanaSR.7 b/man/SAPHanaSR.7
index 66295f9c..26e581fb 100644
--- a/man/SAPHanaSR.7
+++ b/man/SAPHanaSR.7
@@ -1,9 +1,9 @@
 .\" Version: 1.001 
 .\"
-.TH SAPHanaSR 7 "18 Sep 2023" "" "SAPHanaSR-angi"
+.TH SAPHanaSR 7 "18 Dec 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
-SAPHanaSR \- Tools for automating SAP HANA system replication in scale-up setups.
+SAPHanaSR \- Automating SAP HANA system replication in scale-up setups.
 .PP
 .\"
 .SH DESCRIPTION
@@ -12,7 +12,7 @@ SAPHanaSR \- Tools for automating SAP HANA system replication in scale-up setups
 .PP
 This manual page SAPHanaSR provides information for setting up
 and managing automation of SAP HANA system replication (SR) in scale-up setups.
-For scale-out, please refer to SAPHanaSR-ScaleOut(7).
+For scale-out, please refer to SAPHanaSR-ScaleOut(7), see also SAPHanaSR-angi(7).
 .PP
 System replication will help to replicate the database data from one site to
 another site in order to compensate for database failures. With this mode of
@@ -293,6 +293,8 @@ In opposite to Native Storage Extension, the HANA Extension Nodes are changing
 the topology and thus currently are not supported. 
 Please refer to SAP documentation for details.
 .PP
+25. The Linux user root´s shell is /bin/bash, or completely compatible.
+.PP
 .\"
 .SH BUGS
 .\" TODO
@@ -343,9 +345,9 @@ A.Briel, F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2015-2018 SUSE Linux GmbH, Germany.
+(c) 2015-2017 SUSE Linux GmbH, Germany.
 .br
-(c) 2019-2023 SUSE LLC
+(c) 2018-2024 SUSE LLC
 .br
 The package SAPHanaSR-angi comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man/ocf_suse_SAPHana.7 b/man/ocf_suse_SAPHana.7
index bad5e97a..bb003b63 100644
--- a/man/ocf_suse_SAPHana.7
+++ b/man/ocf_suse_SAPHana.7
@@ -165,16 +165,6 @@ Example: "AUTOMATED_REGISTER=true".
 Default value: false\&.
 .RE
 .PP
-\fBREMOVE_SAP_SOCKETS\fR
-.RS 4
-Defines whether the RA removes the UNIX domain sockets related to sapstartsrv
-before (re-)starting sapstartsrv.
-.br
-Example: "REMOVE_SAP_SOCKETS=true".
-.br
-Optional. Default value: true\&.
-.RE
-.PP
 \fBSAPHanaFilter\fR
 .RS 4
 Outdated parameter. Please do not use it any longer.
@@ -431,14 +421,17 @@ property $id="SAPHanaSR" \\
 .\" TODO: output
 .RE
 .PP
-* Show failcount for resource rsc_SAPHanaCon_HA1_HDB00 .
+* Show and delete failcount for resource.
 
+Resource is rsc_SAPHanaCon_HA1_HDB00, node is node22. Useful after a failure
+has been fixed and for testing.
 See also cluster properties migration-threshold, failure-timeout and
 SAPHana parameter PREFER_SITE_TAKEOVER.
 .PP
 .RS 2
-# cibadmin -Ql | grep rsc_SAPHanaCon_HA1_HDB00.*fail-count
-.\" TODO: crm_mon --failcounts 
+# crm resource failcount rsc_SAPHanaCon_HA1_HDB00 show node22
+.br
+# crm resource failcount rsc_SAPHanaCon_HA1_HDB00 delete node22
 .RE
 .PP
 * Check for working NTP service on SLE-HA 15:
@@ -601,9 +594,9 @@ F.Herschel, L.Pinne.
 .SH COPYRIGHT
 (c) 2014 SUSE Linux Products GmbH, Germany.
 .br
-(c) 2015-2018 SUSE Linux GmbH, Germany.
+(c) 2015-2017 SUSE Linux GmbH, Germany.
 .br
-(c) 2019-2023 SUSE LLC
+(c) 2018-2023 SUSE LLC
 .br
 The resource agent SAPHana comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man/ocf_suse_SAPHanaController.7 b/man/ocf_suse_SAPHanaController.7
index 1f86b4e5..f8605b6f 100644
--- a/man/ocf_suse_SAPHanaController.7
+++ b/man/ocf_suse_SAPHanaController.7
@@ -158,15 +158,6 @@ Example: "AUTOMATED_REGISTER=true".
 Optional. Default value: false\&.
 .RE
 .PP
-\fBREMOVE_SAP_SOCKETS\fR
-.RS 4
-Should the RA remove the unix domain sockets related to sapstartsrv before
-starting sapstartsrv? If set to false, the RA does not remove the sockets, but
-runs chown/chgrp to adapte the ownerwhip of the existing sockets.
-.br
-Optional. Default value: true\&.
-.RE
-.PP
 .\"
 .SH SUPPORTED PROPERTIES
 .br
@@ -331,7 +322,7 @@ hana_ha1_glob_filter="ra-act-dec-lpa"
 * Remove log messages filter attribute from CIB, pacemaker-2.0. 
 .br
 Could be done once a specific filter is not needed anymore.
-
+.PP
 .RS 4
 # SAPHanaSR-showAttr
 .br
@@ -353,13 +344,17 @@ Could be done once a specific filter is not needed anymore.
 # grep "SAPHanaContoller.*end.action.monitor_clone.*rc=" /var/log/messages | awk '{print $1,$11,$13}' | colrm 20 32 | tr -d "=()rsc" | tr "T" " "
 .RE
 .PP
-* Show failcount for resource rsc_SAPHanaCon_HA1_HDB00 .
+* Show and delete failcount for resource.
 .br
+Resource is rsc_SAPHanaCon_HA1_HDB00, node is node22. Useful after a failure
+has been fixed and for testing.
 See also cluster properties migration-threshold, failure-timeout and
 SAPHanaController parameter PREFER_SITE_TAKEOVER.
 .PP
-.RS 4
-# cibadmin -Ql | grep rsc_SAPHanaCon_HA1_HDB00.*fail-count
+.RS 4 
+# crm resource failcount rsc_SAPHanaCon_HA1_HDB00 show node22
+.br
+# crm resource failcount rsc_SAPHanaCon_HA1_HDB00 delete node22
 .RE
 .PP
 * Manually trigger an SAPHanaController probe action. Output goes to the
diff --git a/man/ocf_suse_SAPHanaFilesystem.7 b/man/ocf_suse_SAPHanaFilesystem.7
index 00284517..854d866a 100644
--- a/man/ocf_suse_SAPHanaFilesystem.7
+++ b/man/ocf_suse_SAPHanaFilesystem.7
@@ -7,7 +7,7 @@ SAPHanaFilesystem \- Monitors mounted SAP HANA filesystems.
 .PP
 .\"
 .SH SYNOPSIS
-\fBSAPHanaFilesystem\fP [start | stop | status | monitor | meta\-data | validate\-all | reload | methods | usage ]
+\fBSAPHanaFilesystem\fP [ start | stop | status | monitor | meta\-data | validate\-all | reload | methods | usage ]
 .PP
 .\"
 .SH DESCRIPTION
@@ -48,14 +48,14 @@ In case of NFS failure, HANA might stop working but the Linux cluster might not
 take action in reasonable time.
 Due to obligatory NFS for the directory /hana/shared/$SID/, scale-out systems
 are affected more often than scale-up systems.
-The SAPHanaFilsystem RA can be used on local filesystems as well. This migth be
+The SAPHanaFilsystem RA can be used on local filesystems as well. This might be
 useful for scale-up systems.
 Even if SAPHanaFilesystem improves Linux cluster reaction on failed filesystems,
 reliable filesystems are cornerstones for SAP HANA database availability.  
 .PP
-SAPHanaFilesystem relies on cluster attributes set by SAPHanaTopology,
-particularly hana_$SID_site_srHook_$SITE. See manual pages
-ocf_suse_SAPHanaTopology(7) and SAPHanaSR-showAttr(8).
+SAPHanaFilesystem relies on cluster attributes set by SAPHanaTopology and
+susHanaSR.py, particularly hana_$SID_site_srHook_$SITE. See manual pages
+ocf_suse_SAPHanaTopology(7), susHanaSR.py(7) and SAPHanaSR-showAttr(8).
 .PP
 Please see also the REQUIREMENTS section below.
 .PP
@@ -90,7 +90,7 @@ Optional. Default: "DIRECTORY=/hana/shared/$SID/".
 .PP
 \fBON_FAIL_ACTION\fR
 .RS 4
-Internal RA decision in case of monitor failure. Values: [ ignore | fence].
+Internal RA decision in case of monitor failure. Values: [ ignore | fence ].
 .br
 - ignore: do nothing, just report failure into logs.
 .br
@@ -295,13 +295,16 @@ The constraints´ names are starting with "SAPHanaFil".
 # grep "Stop.of.failed.*is.fenced" /var/log/messages
 .RE
 .PP
-* Show failcount for resource agent.
+* Show and delete failcount for resource.
 .PP
-SID is SLE, instance number is 00.
+Resource is rsc_SAPHanaFil_HA1_HDB00, node is node22. Useful after a failure
+has been fixed and for testing.
 See also cluster properties migration-threshold and failure-timeout.
 .PP
 .RS 4
-# cibadmin -Ql | grep rsc_SAPHanaFil_SLE_HDB00.*fail-count
+# crm resource failcount rsc_SAPHanaFil_HA1_HDB00 show node22
+.br
+# crm resource failcount rsc_SAPHanaFil_HA1_HDB00 delete node22
 .RE
 .PP
 * Example for static NFS mount.
diff --git a/man/susHanaSR.py.7 b/man/susHanaSR.py.7
index 3ed2c1c3..af1c1475 100644
--- a/man/susHanaSR.py.7
+++ b/man/susHanaSR.py.7
@@ -1,6 +1,6 @@
 .\" Version: 1.001
 .\"
-.TH susHanaSR.py 7 "13 Apr 2023" "" "SAPHanaSR"
+.TH susHanaSR.py 7 "04 Jan 2024" "" "SAPHanaSR"
 .\"
 .SH NAME
 susHanaSR.py \- Provider for SAP HANA srHook method srConnectionChanged().
@@ -263,14 +263,12 @@ the sudo permissions configuration
 path to HANA tracefiles
 .TP
 /usr/sap/$SID/HDB$nr/.crm_attribute.$SITE
-the internal cache for srHook status changes while Linux cluster is down, file is owned by ${SID}adm and must never be touched
+the internal cache for srHook status changes while Linux cluster is down, file is owned and read/write by ${sid}adm and must never be touched
 .PP
 .\"
 .SH REQUIREMENTS
 1. SAP HANA 2.0 SPS04 or later provides the HA/DR provider hook method
 srConnectionChanged() with multi-target aware parameters.
-The multi-target aware parameters are needed for the SAPHanaSR scale-up
-package.
 .PP
 2. No other HADR provider hook script should be configured for the
 srConnectionChanged() method. Hook scripts for other methods, provided in
@@ -280,8 +278,14 @@ contradictingly.
 3. The user ${sid}adm needs execution permission as user root for the command
 crm_attribute.
 .PP
-4. The hook provider needs to be added to the HANA global configuration,
+4. The user ${sid}adm needs ownership and read/write permission on the internal
+cache file /usr/sap/$SID/HDB$nr/.crm_attribute.$SITE and its parent directory.
+.PP
+5. The hook provider needs to be added to the HANA global configuration,
 in memory and on disk (in persistence).
+.PP
+6. The srHook script runtime almost completely depends on call-outs to OS and
+Linux cluster.
 .\"
 .SH BUGS
 In case of any problem, please use your favourite SAP support process to open
@@ -290,7 +294,7 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .PP
 .\"
 .SH SEE ALSO
-\fBSAPHanaSR\fP(7) ,
+\fBSAPHanaSR-angi\fP(7) ,
 \fBocf_suse_SAPHanaTopology\fP(7) , \fBocf_suse_SAPHanaController\fP(7) ,
 \fBocf_heartbeat_IPaddr2\fP(7) ,
 \fBsusCostOpt.py\fP(7) , \fBsusTkOver.py\fP(7) , \fBsusChkSrv.py\fP (7) ,
@@ -309,9 +313,9 @@ A.Briel, F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
-(c) 2015-2018 SUSE Linux GmbH, Germany.
+(c) 2015-2017 SUSE Linux GmbH, Germany.
 .br
-(c) 2019-2023 SUSE LLC
+(c) 2018-2024 SUSE LLC
 .br
 susHanaSR.py comes with ABSOLUTELY NO WARRANTY.
 .br
diff --git a/man/susHanaSrMultiTarget.py.7 b/man/susHanaSrMultiTarget.py.7
index 44d49376..0bbbcb02 100644
--- a/man/susHanaSrMultiTarget.py.7
+++ b/man/susHanaSrMultiTarget.py.7
@@ -283,7 +283,7 @@ the sudo permission configuration
 the directory with HANA trace files
 .TP
 /usr/sap/$SID/HDB$nr/.crm_attribute.$SITE
-the internal cache for srHook status changes while Linux cluster is down, file is owned by ${SID}adm and must never be touched
+the internal cache for srHook status changes while Linux cluster is down, file is owned and read/write by ${sid}adm and must never be touched
 .PP
 .\"
 .SH REQUIREMENTS 
diff --git a/ra/SAPHanaController b/ra/SAPHanaController
index db64f8e6..1a538216 100755
--- a/ra/SAPHanaController
+++ b/ra/SAPHanaController
@@ -27,7 +27,6 @@
 #   OCF_RESKEY_INSTANCE_PROFILE (optional, well known directories will be searched by default)
 #   OCF_RESKEY_PREFER_SITE_TAKEOVER (optional, default is no)
 #   OCF_RESKEY_DUPLICATE_PRIMARY_TIMEOUT (optional, time difference needed between two last-primary-tiemstampe (lpt))
-#   OCF_RESKEY_REMOVE_SAP_SOCKETS (optional, default is true)
 #
 # HANA must support the following commands:
 #     hdbnsutil -sr_stateConfiguration
diff --git a/ra/saphana-common-lib b/ra/saphana-common-lib
index 15f026e9..d44b7cf5 100755
--- a/ra/saphana-common-lib
+++ b/ra/saphana-common-lib
@@ -581,12 +581,16 @@ function saphana_init_attribute_definitions() {
 # get system replication mode and local site name
 #
 # globals: gSrMode(w), gSite(w), gSrr(w)
+#          gSrSuspended
 #
 function get_local_sr_config() {
     # called by: TODO
     # * get sr_mode (primary|sync|synmem|async|none)
     # * get local site name (MAINZ, KOELN, DUESSELDORF, AACHEN)
     # TODO PRIO3: NG - move SAP commands to command-init function
+    # TODO: PRIO2: Check for suspended primary and set grSrSuspended either to false, empty(init), unknown(gP does not cntain this info) or true
+    #grSrSuspended=""
+    # TODO: PRIO2: for suspended primary detection (lss 3 or 4) we would need hdbnsutil -sr_state)
     hdbState="hdbnsutil -sr_stateConfiguration"
     # hdbMap="hdbnsutil -sr_stateHostMapping"
     #### SAP-CALL
@@ -605,6 +609,7 @@ function get_local_sr_config() {
                 # if 'actual_mode' is not available, fallback to 'mode'
                 if [ -z "$gSrMode" ]; then
                     [[ "$hdbANSWER" =~ "/mode="([^$'\n']+) ]] && gSrMode=${BASH_REMATCH[1]}
+                    #grSrSuspended="unknown"
                 fi
                 super_ocf_log info "ACT: hdbnsutil not answering - using global.ini as fallback - srmode=$gSrMode"
                 ;;
@@ -688,6 +693,9 @@ function get_local_virtual_name() {
 # output:   state like P,S,N,D
 # rc:       0, if P, S, N
 #           1, if D
+# TODO PRIO2: suspended primary handling:
+#           hdbnsutil -sr_state --sapcontrol=1 includes the following output, if the primary is suspended:
+#           isPrimarySuspended=true
 #
 function check_for_primary() {
     # called by: TODO
@@ -715,8 +723,12 @@ function check_for_primary() {
               state="$HANA_STATE_STANDALONE";;
         * )
               # TODO PRIO3: NG - Should we set SFAIL?
-              dump=$( echo "$gSrMode" | hexdump -C );
-              super_ocf_log err "ACT: check_for_primary:  we didn't expect srmode to be: DUMP: <$dump>"
+              if [[ -n "$gSrMode" ]]; then
+                  dump=$( echo -n "$gSrMode" | hexdump -C );
+                  super_ocf_log err "ACT: check_for_primary: we didn't expect srmode to be: DUMP: <$dump>"
+              else
+                  super_ocf_log err "ACT: check_for_primary: we didn't expect empty result for srmode."
+              fi
               # NG - keep last value from cluster, if we did not get a valid answer at this moment
               state="$(get_hana_site_attribute "$gSite" "${ATTR_NAME_HANA_SITE_SRR[@]}")"
               if [[ -z "$state" ]]; then
@@ -986,7 +998,11 @@ function node_role_walk() {
     fi
     case "$raType" in
         saphana* )  # SAPHanaController to set the MNS attribute
-                    set_hana_site_attribute "$gSite" "$gTheMaster" "${ATTR_NAME_HANA_SITE_MNS[@]}"
+                    if [[ -n "$gSite" && -n "$gTheMaster" ]]; then
+                        set_hana_site_attribute "$gSite" "$gTheMaster" "${ATTR_NAME_HANA_SITE_MNS[@]}"
+                    else
+                        super_ocf_log warn "DEC: either gSite or gTheMaster are not set. Do not set MNS"
+                    fi
                     ;;
         sht*     )  # Currently skip that on SAPHanaTopology (to be checked)
                     ;;
diff --git a/ra/saphana-controller-common-lib b/ra/saphana-controller-common-lib
index b9517e3c..286037cc 100755
--- a/ra/saphana-controller-common-lib
+++ b/ra/saphana-controller-common-lib
@@ -23,7 +23,6 @@
 #   OCF_RESKEY_INSTANCE_PROFILE (optional, well known directories will be searched by default)
 #   OCF_RESKEY_PREFER_SITE_TAKEOVER (optional, default is no)
 #   OCF_RESKEY_DUPLICATE_PRIMARY_TIMEOUT (optional, time difference needed between two last-primary-tiemstampe (lpt))
-#   OCF_RESKEY_REMOVE_SAP_SOCKETS (optional, default is true)
 #
 # HANA must support the following commands:
 #     hdbnsutil -sr_stateConfiguration (unsure, if this means >= SPS110, SPS111 or SPS10x)
@@ -412,49 +411,17 @@ function saphana_init_sap_commands() {
 #
 # handle_unix_domain_sockets
 # params: -
-# globals: OCF_RESKEY_REMOVE_SAP_SOCKETS
 #
 function handle_unix_domain_sockets() {
     # called by: TODO
     super_ocf_log info "FLOW ${FUNCNAME[0]}"
 
-    if ocf_is_true "$RemoveSAPSockets"; then
-        # previous and new default handling
-        # removing the unix domain socket files as they might have
-        # wrong permissions or ownership
-        # they will be recreated by sapstartsrv during next start
-        rm -f /tmp/.sapstream5"${InstanceNr}"13
-        rm -f /tmp/.sapstream5"${InstanceNr}"14
-    else
-        # try to change permission and ownership of the unix domain socket files
-        for sockFile in /tmp/.sapstream5"${InstanceNr}"13 /tmp/.sapstream5"${InstanceNr}"14; do
-            sockError=false
-            if [ -S "$sockFile" ]; then
-                if ! chown "${sid}"adm "$sockFile" > /dev/null 2>&1; then
-                    sockError=true
-                fi
-                if ! chgrp sapsys "$sockFile" > /dev/null 2>&1; then
-                    sockError=true
-                fi
-                if chmod 700 "$sockFile" > /dev/null 2>&1; then
-                    sockError=true
-                fi
-            else
-                if [ -f "$sockFile" ]; then
-                    super_ocf_log error "RA: file '$sockFile' still exists, but is NO longer a socket."
-                    super_ocf_log info "DEC: remove file '$sockFile' to give sapstartsrv a chance to create it the right way during next start"
-                    sockError=true
-                else
-                    super_ocf_log info "RA: file '$sockFile' not found. Nothing to do, let sapstartsrv create a new one during start"
-                fi
-            fi
-            if ocf_is_true "$sockError"; then
-                # fallback - if there are Errors, remove unix domain socket as
-                # last resort
-                rm -f "$sockFile"
-            fi
-        done
-    fi
+    # previous and new default handling
+    # removing the unix domain socket files as they might have
+    # wrong permissions or ownership
+    # they will be recreated by sapstartsrv during next start
+    rm -f /tmp/.sapstream5"${InstanceNr}"13
+    rm -f /tmp/.sapstream5"${InstanceNr}"14
 } # end function handle_unix_domain_sockets
 
 #
@@ -475,7 +442,17 @@ function check_sapstartsrv() {
         local systemd_unit_name="SAP${SID}_${InstanceNr}.service"
 
         if "$SYSTEMCTL" is-active --quiet "$systemd_unit_name"; then
-            super_ocf_log info "ACT: systemd service $systemd_unit_name is active"
+            if output=$("$SAPCONTROL" -nr "$InstanceNr" -function ParameterValue INSTANCE_NAME -format script)
+            then
+                super_ocf_log info "ACT: systemd service $systemd_unit_name is active and Unix Domain Socket authentication is working."
+            else
+                super_ocf_log info "ACT: systemd service $systemd_unit_name is active but Unix Domain Socket authentication is NOT working."
+                "$SYSTEMCTL" kill --kill-who=main --signal=9 "$systemd_unit_name"
+                "$SYSTEMCTL" is-active --quiet "$systemd_unit_name"; src=$?
+                if [[ "$src" -ne 0 ]]; then
+                    "$SYSTEMCTL" start "$systemd_unit_name" >/dev/null 2>&1; src=$?
+                fi
+            fi
         else
             super_ocf_log warn "ACT: systemd service $systemd_unit_name is not active, it will be started using systemd"
             # use start, because restart does also stop sap instance
@@ -488,29 +465,24 @@ function check_sapstartsrv() {
         fi
     else
         # no SAP systemd unit available, continue with old code...
-        if [ ! -S "/tmp/.sapstream5${InstanceNr}13" ]; then
-            super_ocf_log warn "ACT: sapstartsrv is not running for instance $SID-$InstanceName (no UDS), it will be started now"
-            restart=1
-        else
-            if output=$("$SAPCONTROL" -nr "$InstanceNr" -function ParameterValue INSTANCE_NAME -format script)
+        if output=$("$SAPCONTROL" -nr "$InstanceNr" -function ParameterValue INSTANCE_NAME -format script)
+        then
+            runninginst=$(echo "$output" | grep '^0 : ' | cut -d' ' -f3)
+            if [ "$runninginst" != "$InstanceName" ]
             then
-                runninginst=$(echo "$output" | grep '^0 : ' | cut -d' ' -f3)
-                if [ "$runninginst" != "$InstanceName" ]
+                super_ocf_log warn "ACT: sapstartsrv is running for instance $runninginst, that service will be killed"
+                restart=1
+            else
+                if ! output=$("$SAPCONTROL" -nr "$InstanceNr" -function AccessCheck Start)
                 then
-                    super_ocf_log warn "ACT: sapstartsrv is running for instance $runninginst, that service will be killed"
+                    super_ocf_log warn "ACT: FAILED - sapcontrol -nr $InstanceNr -function AccessCheck Start ($(ls -ld1 "/tmp/.sapstream5${InstanceNr}13"))"
+                    super_ocf_log warn "ACT: sapstartsrv will be restarted to try to solve this situation, otherwise please check sapstsartsrv setup (SAP Note 927637)"
                     restart=1
-                else
-                    if ! output=$("$SAPCONTROL" -nr "$InstanceNr" -function AccessCheck Start)
-                    then
-                        super_ocf_log warn "ACT: FAILED - sapcontrol -nr $InstanceNr -function AccessCheck Start ($(ls -ld1 "/tmp/.sapstream5${InstanceNr}13"))"
-                        super_ocf_log warn "ACT: sapstartsrv will be restarted to try to solve this situation, otherwise please check sapstsartsrv setup (SAP Note 927637)"
-                        restart=1
-                    fi
                 fi
-            else
-                super_ocf_log warn "ACT: sapstartsrv is not running for instance $SID-$InstanceName, it will be started now"
-                restart=1
             fi
+        else
+            super_ocf_log warn "ACT: sapstartsrv is not running for instance $SID-$InstanceName, it will be started now"
+            restart=1
         fi
         if [ -z "$runninginst" ]; then runninginst="$InstanceName"; fi
         if [[ "$restart" == 1 ]]
diff --git a/ra/saphana-controller-lib b/ra/saphana-controller-lib
index 3af7b983..42b52fd1 100755
--- a/ra/saphana-controller-lib
+++ b/ra/saphana-controller-lib
@@ -23,7 +23,6 @@
 #   OCF_RESKEY_INSTANCE_PROFILE (optional, well known directories will be searched by default)
 #   OCF_RESKEY_PREFER_SITE_TAKEOVER (optional, default is no)
 #   OCF_RESKEY_DUPLICATE_PRIMARY_TIMEOUT (optional, time difference needed between two last-primary-tiemstampe (lpt))
-#   OCF_RESKEY_REMOVE_SAP_SOCKETS (optional, default is true)
 #
 # HANA must support the following commands:
 #     hdbnsutil -sr_stateConfiguration (unsure, if this means >= SPS110, SPS111 or SPS10x)
@@ -141,14 +140,6 @@ function saphana_print_parameters() {
         <shortdesc lang="en">Local or site recover preferred?</shortdesc>
         <content type="string" default="true" />
     </parameter>
-    <parameter name="REMOVE_SAP_SOCKETS" unique="0" required="0">
-        <longdesc lang="en">Should the RA remove the unix domain sockets related to sapstartsrv before (re-)starting sapstartsrv ? Default="true"
-        no: Do not remove the sockets, try chown/chgrp instead
-        yes: Do remove the sockets
-        </longdesc>
-        <shortdesc lang="en">Remove unix domain sockets related to sapstartsrv?</shortdesc>
-        <content type="boolean" default="true" />
-    </parameter>
     <parameter name="AUTOMATED_REGISTER"  unique="0" required="0">
         <shortdesc lang="en">Define, if a former primary should automatically be registered.</shortdesc>
         <longdesc lang="en">The parameter AUTOMATED_REGISTER defines, whether a former primary instance should
@@ -392,7 +383,6 @@ function saphana_init_get_ocf_parameters() {
     sidadm="${sid}adm"
     PreferSiteTakeover="${OCF_RESKEY_PREFER_SITE_TAKEOVER^^}" # upper case
     AUTOMATED_REGISTER="${OCF_RESKEY_AUTOMATED_REGISTER:-false}"
-    RemoveSAPSockets="${OCF_RESKEY_REMOVE_SAP_SOCKETS:-true}"
     DUPLICATE_PRIMARY_TIMEOUT="${OCF_RESKEY_DUPLICATE_PRIMARY_TIMEOUT:-7200}"
     ocf_env=$(env | grep 'OCF_RESKEY_CRM')
     super_ocf_log debug "DBG: OCF: $ocf_env"
@@ -411,7 +401,7 @@ function saphana_init() {
     local rc="$OCF_SUCCESS" clN
     SYSTEMCTL="/usr/bin/systemctl"
     NODENAME=$(crm_node -n)
-    saphana_init_get_ocf_parameters # set SID, sid, sidadm, InstanceNr, InstanceName HANA_CALL_TIMEOUT, PreferSiteTakeover, AUTOMATED_REGISTER, RemoveSAPSockets
+    saphana_init_get_ocf_parameters # set SID, sid, sidadm, InstanceNr, InstanceName HANA_CALL_TIMEOUT, PreferSiteTakeover, AUTOMATED_REGISTER
     #
     # create directory for HANA_CALL command sdtout and stderr tracking
     #
@@ -1664,6 +1654,10 @@ function saphana_monitor_secondary() {
                 promoted=1;
                 ;;
             DEMOTED )  # This is the status we expect
+                if ocf_is_probe; then
+                    super_ocf_log info "ACT: saphana_monitor_secondary: set global_sec to $gSite"
+                    set_hana_attribute "$NODENAME" "$gSite" "${ATTR_NAME_HANA_SEC[@]}"
+                fi
                 promoted=0;
                 ;;
             WAITING4PRIM ) # We are WAITING for PRIMARY so not testing the HANA engine now but check for a new start
@@ -1918,6 +1912,16 @@ function saphana_monitor_clone() {
     return "$rc"
 } # end function saphana_monitor_clone
 
+function saphana_monitor() {
+    # this function should never be called currently. it is intended for future releases which might support un-cloned resources
+    if ! ocf_is_clone; then
+        super_ocf_log error "RA: resource is not defined as clone. This is not supported (OCF_ERR_UNIMPLEMENTED)"
+        return "$OCF_ERR_UNIMPLEMENTED"
+    else
+        return "$OCF_SUCCESS"
+    fi 
+} # end function saphana_monitor
+
 function saphana_promote_clone() {
     # function: saphana_promote_clone - promote a hana clone
     # params:   -
diff --git a/ra/saphana-filesystem-lib b/ra/saphana-filesystem-lib
index 150ae462..535e2121 100755
--- a/ra/saphana-filesystem-lib
+++ b/ra/saphana-filesystem-lib
@@ -187,10 +187,9 @@ function shfs_init() {
     HANA_CALL_TIMEOUT="${OCF_RESKEY_HANA_CALL_TIMEOUT:-90}"
     ON_FAIL_ACTION="${OCF_RESKEY_ON_FAIL_ACTION:-fail}"
     td_hana_shared="$fs_hana_shared/.suse_SAPHanaFilesystem/${NODENAME}"
-    pp_hana_shared="/dev/shm/poison_pill_${SID}"
+    pp_hana_shared="/run/SAPHanaFileSystem_poison_pill_${SID}"
     sid="${SID,,}"
     export sidadm="${sid}adm"
-    RemoveSAPSockets="" # not needed in SAPHanaFilesystem, but referened in shell lib saphana-controller-common-lib used by SAPHanaFilesystem
     #
     # init attribute definitions
     #
@@ -236,12 +235,12 @@ function shfs_stop() {
     local ha_ps_rc
     ha_pseudo_resource "$OCF_RESOURCE_INSTANCE" stop; ha_ps_rc="$?"
     if [ -e "$pp_hana_shared" ]; then
-	rm "$pp_hana_shared"
+        rm "$pp_hana_shared"
         super_ocf_log info "RA poison pill detected - reporting stop error - sleep 10s"
 	sleep 10
         rc="$OCF_ERR_GENERIC"
     else
-	rc="$ha_ps_rc"
+        rc="$ha_ps_rc"
     fi
     super_ocf_log info "FLOW ${FUNCNAME[0]} rc=$rc"
     return "$rc"
@@ -250,7 +249,7 @@ function shfs_stop() {
 function shfs_reset_poison_pill() {
     if [ -e "$pp_hana_shared" ]; then
         super_ocf_log info "reset old RA poison pill"
-	rm "$pp_hana_shared"
+        rm "$pp_hana_shared"
     fi
 }
 
diff --git a/ra/saphana-topology-lib b/ra/saphana-topology-lib
index 129814f9..4cf54f7f 100755
--- a/ra/saphana-topology-lib
+++ b/ra/saphana-topology-lib
@@ -418,6 +418,7 @@ function sht_start_clone() {
     # called by: TODO
     super_ocf_log info "FLOW ${FUNCNAME[0]} ($*)"
     local rc="$OCF_NOT_RUNNING"
+    get_local_virtual_name
     sht_start; rc="$?"
     return "$rc"
 } # end function sht_start_clone
@@ -448,7 +449,7 @@ function sht_stop_clone() {
     if [ -z "$timeout" ] || [ "$timeout" -lt "$stdTimeOut" ]; then
         timeout=$stdTimeOut
     fi
-
+    get_local_virtual_name
     gNodeRole="$( get_role_by_landscape "$gVirtName" --timeout="$timeout")"; hanalrc="$?"
     if [[ "$hanalrc" != "124" ]]; then
         # normal exit, use gNodeRole
diff --git a/srHook/susChkSrv.py b/srHook/susChkSrv.py
index c40da7ac..3432fc92 100755
--- a/srHook/susChkSrv.py
+++ b/srHook/susChkSrv.py
@@ -24,7 +24,8 @@
 TODO: The hook might not do it's action, if the SR is not-in-sync. Maybe to be selected by a
       parameter
 TODO: action "attr" (attr is to inform the cluster (RA) to handle this SAP instance
-      as broken - maybe the project will not implement this as the other actions are already sufficient)
+      as broken - maybe the project will not implement this as the other actions are 
+      already sufficient)
 TODO: action "kill". The hard-coded sleep 5 is to allow the nameserver to log events. To be
       checked, if 5s is a good sleep time. Maybe to be tuned by a parameter
 TODO: To be tested with "real"  slow dying indexservers
@@ -58,32 +59,32 @@ def getEpisode():
     return episode
 
 
-def logTimestamp(self, method, episode, outputMessage):
-    """ write message to log file with timestamp """
-    traceFilepath = os.path.join(os.environ['SAP_RETRIEVAL_PATH'], 'trace',
-                                 'nameserver_suschksrv.trc')
-    try:
-        with open(traceFilepath, "a", encoding="UTF-8") as saphanasr_multitarget_file:
-            currentTimeStr = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f ')
-            outputMessage = f"{currentTimeStr} [{episode}] {outputMessage}"
-            saphanasr_multitarget_file.write(outputMessage + "\n")
-            saphanasr_multitarget_file.flush()
-
-    except (RuntimeError, TypeError, NameError, OSError) as err:
-        self.tracer.info(f"{self.__class__.__name__}.{method}() logTimestamp error {err}")
-        print(f"Error in logTimestamp(): {err}")
 
 
 try:
     class susChkSrv(HADRBase):
         """ class for HADR hook script to handle service changed status events """
 
+        def logTimestamp(self, method, episode, outputMessage):
+            """ write message to log file with timestamp """
+            traceFilepath = os.path.join(os.environ['SAP_RETRIEVAL_PATH'], 'trace',
+                                         'nameserver_suschksrv.trc')
+            try:
+                with open(traceFilepath, "a", encoding="UTF-8") as saphanasr_multitarget_file:
+                    currentTimeStr = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f ')
+                    outputMessage = f"{currentTimeStr} [{episode}] {outputMessage}"
+                    saphanasr_multitarget_file.write(outputMessage + "\n")
+                    saphanasr_multitarget_file.flush()
+            except (RuntimeError, TypeError, NameError, OSError) as err:
+                self.tracer.info(f"{self.__class__.__name__}.{method}() logTimestamp error {err}")
+                print(f"Error in logTimestamp(): {err}")
+
         def __init__(self, *args, **kwargs):
             # delegate construction to base class
             super().__init__(*args, **kwargs)
             method = "init"
             episode = getEpisode()
-            logTimestamp(self, method, episode, "init called")
+            logTimestamp(method, episode, "init called")
 
             # read settings from global.ini
             # read sustkover_timeout
@@ -97,12 +98,12 @@ def __init__(self, *args, **kwargs):
                                  "firstStopThenKill"])
                 if not isValidAction:
                     msg = f"Invalid action_on_lost {self.action_on_lost}. Fallback to 'ignore'"
-                    logTimestamp(self, method, episode, msg)
+                    logTimestamp(method, episode, msg)
                     self.tracer.info(msg)
                     self.action_on_lost = "ignore_fallback"
             else:
                 msg = "action_on_lost not configured. Fallback to 'ignore'"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 self.action_on_lost = "ignore_default"
             if self.config.hasKey("kill_signal"):
@@ -113,7 +114,7 @@ def __init__(self, *args, **kwargs):
             msg = (f"{self.__class__.__name__}.{method}() version {SRHookVersion}, parameter"
                    f" info: action_on_lost={self.action_on_lost} stop_timeout={self.stop_timeout}"
                    f" kill_signal={self.killSignal}")
-            logTimestamp(self, method, episode, msg)
+            logTimestamp(method, episode, msg)
             self.tracer.info(msg)
             # TODO: use action specific init messages (e.g. for stop also report stop_timeout)
             self.takeover_active = False
@@ -155,9 +156,9 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             msg1 = f"{SRHookName} version {SRHookVersion}. Method {method} method called."
             msg2 = f"{SRHookName} {method} method called with Dict={ParamDict}"
             msg3 = f"{SRHookName} {method} method called with SAPSYSTEMNAME={mySID}"
-            logTimestamp(self, method, episode, msg1)
-            logTimestamp(self, method, episode, msg2)
-            logTimestamp(self, method, episode, msg3)
+            logTimestamp(method, episode, msg1)
+            logTimestamp(method, episode, msg2)
+            logTimestamp(method, episode, msg3)
             self.tracer.info(msg1)
             self.tracer.info(msg2)
             self.tracer.info(msg3)
@@ -174,7 +175,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             databaseStatus = ParamDict['database_status']
             msg = (f"srv:{service}-{port}-{status}-{previousStatus}"
                    f" db:{databaseName}-{databaseId}-{databaseStatus} daem:{daemonStatus}")
-            logTimestamp(self, method, episode, msg)
+            logTimestamp(method, episode, msg)
             self.tracer.info(msg)
 
             # analysis, if the event looks like an dying indexserver (LOST)
@@ -199,54 +200,54 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             #
             if (isIndexserver and serviceRestart and daemonActive and databaseActive):
                 msg = f"LOST: indexserver event looks like a lost indexserver (status={status})"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 isLostIndexserver = True
                 eventKnown = True
             if (isIndexserver and serviceActive and daemonActive and databaseActive):
                 if self.takeover_active:
                     msg = "TAKEOVER: indexserver event looks like a takeover event"
-                    logTimestamp(self, method, episode, msg)
+                    logTimestamp(method, episode, msg)
                     self.tracer.info(msg)
                 else:
                     msg = ("LOST: indexserver event looks like a lost indexserver"
                            " (indexserver started)")
-                    logTimestamp(self, method, episode, msg)
+                    logTimestamp(method, episode, msg)
                     self.tracer.info(msg)
                 eventKnown = True
                 # TODO: this event (LOST/started) seems also to come, if a sr_takeover is been
                 #       processed (using preTakeover() and postTakeover() to mark this event?)
             if (isIndexserver and serviceStopping and daemonStop):
                 msg = "STOP: indexserver event looks like graceful instance stop"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceDown and daemonStop):
                 msg = ("STOP: indexserver event looks like graceful instance stop"
                        " (indexserver stopped)")
                 self.tracer.info(msg)
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 eventKnown = True
             if (isIndexserver and serviceStopping and daemonActive and databaseStop):
                 msg = "STOP: indexserver event looks like graceful tenant stop"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceDown and daemonActive and databaseStop):
                 msg = ("STOP: indexserver event looks like graceful tenant stop"
                        " (indexserver stopped)")
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceRestart and daemonStarting and databaseActive):
                 msg = "START: indexserver event looks like graceful tenant start"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceActive and daemonStarting and databaseActive):
                 msg = ("START: indexserver event looks like graceful tenant start"
                        " (indexserver started)")
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and not eventKnown):
@@ -255,7 +256,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
                        f" daemonActive={daemonActive}, daemonStop={daemonStop},"
                        f" daemonStarting={daemonStarting},"
                        f" databaseActive={databaseActive}, databaseStop={databaseStop}")
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
             # event on secondary, if HA1 tenant is stopped on primary
             # DBG: version=0.2.7,serviceRestart=True, serviceStop=True, serviceDown=False,
@@ -271,11 +272,11 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             # pylint: disable-next=line-too-long
             if (isLostIndexserver and (self.action_on_lost in ["ignore", "ignore_fallback", "ignore_default"])):
                 msg = f"LOST: event ignored. action_on_lost={self.action_on_lost}"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
             if (isLostIndexserver and self.action_on_lost == "fence"):
                 msg = f"LOST: fence node. action_on_lost={self.action_on_lost}"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 tout_cmd = ""
                 action_cmd = f"sudo /usr/bin/SAPHanaSR-hookHelper --sid={mySID} --case=fenceMe"
@@ -283,7 +284,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             if (isLostIndexserver and self.action_on_lost == "kill"):
                 msg = (f"LOST: kill instance. action_on_lost={self.action_on_lost}"
                        f" signal={self.killSignal}")
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 tout_cmd = ""
                 action_cmd = f"HDB kill-{self.killSignal}"
@@ -292,12 +293,12 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
                 os.WEXITSTATUS(os.system(f"sleep 5; {tout_cmd} {action_cmd}"))
                 # the following message will most-likely also be lost, if we use signal 9
                 msg = f"LOST: killed instance. action_on_lost={self.action_on_lost}"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 # DONE: hardcoded 5 here to be moved to a self.sleep_before_action
                 #       (or however it will be named)
             if (isLostIndexserver and self.action_on_lost == "stop"):
                 msg = f"LOST: stop instance. action_on_lost={self.action_on_lost}"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 tout_cmd = f"timeout {self.stop_timeout}"
                 # action_cmd = "HDB stop"
@@ -309,7 +310,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
                 # this code could be removed at any time without notice
                 # the code does not promise that it will be part of any product later
                 msg = f"LOST: firstStopThenKill instance. action_on_lost={self.action_on_lost}"
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 action_cmd = (f"/usr/bin/SAPHanaSR-hookHelper --sid={mySID}"
                               f" --ino={self.ino} --case=firstStopThenKill")
@@ -320,7 +321,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
                 # the code does not promise that it will be part of any product later
                 msg = (f"LOST: set cluster attribute. action_on_lost={self.action_on_lost}"
                        " is currently not implemented")
-                logTimestamp(self, method, episode, msg)
+                logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 # TODO add attribute code here
             return 0
diff --git a/srHook/susHanaSR.py b/srHook/susHanaSR.py
index a11ed691..a1ba7776 100755
--- a/srHook/susHanaSR.py
+++ b/srHook/susHanaSR.py
@@ -91,7 +91,15 @@ def srConnectionChanged(self, ParamDict, **kwargs):
                 self.tracer.info(f"{self.__class__.__name__}.{method}() {my_msg}\n")
                 fallback_file_name = f"../.crm_attribute.{my_site}"
                 fallback_stage_file_name = f"../.crm_attribute.stage.{my_site}"
-                if ret_code != 0:
+                if ret_code == 0:
+                    # 
+                    # cluster attribute set was successfull - delete pending fallback file, if existing
+                    try:
+                        os.remove(fallback_file_name)
+                        self.tracer.info("new event - pending fallback file {0} deleted".format(fallback_file_name))
+                    except FileNotFoundError:
+                        pass
+                else:
                     #
                     # FALLBACK
                     # sending attribute to the cluster failed - using fallback method and write
@@ -107,13 +115,33 @@ def srConnectionChanged(self, ParamDict, **kwargs):
                     # SAP HANA swarm nodes
                     #
                     attribute_name = f"hana_{mysid_lower}_site_srHook_{my_site}"
-                    with open(fallback_stage_file_name, "w", encoding="UTF-8") as fallback_file_obj:
-                        fallback_file_obj.write(f"{attribute_name} = {my_srs}")
+                    try:
+                        with open(fallback_stage_file_name, "w", encoding="UTF-8") as fallback_file_obj:
+                            fallback_file_obj.write(f"{attribute_name} = {my_srs}")
+                    except PermissionError:
+                        my_msg = f"ERROR: Permission denied for file {fallback_stage_file_name}"
+                        self.tracer.error(f"{self.__class__.__name__}.{method}() {my_msg}\n")
+                    except FileNotFoundError:
+                        my_msg = f"ERROR: File not found error occured during creating file {fallback_stage_file_name}"
+                        self.tracer.error(f"{self.__class__.__name__}.{method}() {my_msg}\n")
+                    except OSError as oerr:
+                        my_msg = f"ERROR: OS error occured during creating file {fallback_stage_file_name}: {oerr}"
+                        self.tracer.error(f"{self.__class__.__name__}.{method}() {my_msg}\n")
                     #
                     # release the stage file to the original name (move is used to be atomic)
                     #      .crm_attribute.stage.<site> is renamed to .crm_attribute.<site>
                     #
-                    os.rename(fallback_stage_file_name, fallback_file_name)
+                    try:
+                        os.rename(fallback_stage_file_name, fallback_file_name)
+                    except PermissionError:
+                        my_msg = f"ERROR: Permission denied to move file {fallback_stage_file_name} to {fallback_file_name}"
+                        self.tracer.error(f"{self.__class__.__name__}.{method}() {my_msg}\n")
+                    except FileNotFoundError:
+                        my_msg = f"ERROR: File not found error occured during moving file {fallback_stage_file_name} to {fallback_file_name}"
+                        self.tracer.error(f"{self.__class__.__name__}.{method}() {my_msg}\n")
+                    except OSError as oerr:
+                        my_msg = f"ERROR: OS error occured during moving file {fallback_stage_file_name} to {fallback_file_name}: {oerr}"
+                        self.tracer.error(f"{self.__class__.__name__}.{method}() {my_msg}\n")
             return 0
 except NameError as e:
     print(f"Could not find base class ({e})")
diff --git a/test/.gitignore b/test/.gitignore
index a8539dde..44c980a5 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -8,3 +8,4 @@ misc-*
 python_examples
 tmux
 testLog*.txt
+.test_properties
diff --git a/test/SAPHanaSR-checkJson b/test/SAPHanaSR-checkJson
new file mode 100755
index 00000000..4315bd57
--- /dev/null
+++ b/test/SAPHanaSR-checkJson
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+# pylint: disable=consider-using-f-string
+# pylint: disable=fixme
+# TODO: check which imports could be removed in the future (time, re, json)?
+# TODO: legacy (classic) has "Sites" instead of "Site" (angi) and "Hosts" (classic/legacy) instead of "Host" (angi) --> could we set that via json files?
+"""
+ SAPHanaSR-checkJson
+ Author:       Fabian Herschel, Jan 2024
+ License:      GNU General Public License (GPL)
+ Copyright:    (c) 2024 SUSE LLC
+"""
+
+# pylint: disable=unused-import
+import json
+import argparse
+#sys.path.insert(1, '/usr/lib/SAPHanaSR-tester')
+#from saphana_sr_test import SaphanasrTest
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--file", help="specify the json file")
+parser.add_argument("--quiet", help="do not output json data on success", action="store_true")
+args = parser.parse_args()
+json_file = None
+quiet = False
+
+if args.file:
+    json_file = args.file
+if args.quiet:
+    quiet = True
+
+if json_file is None:
+    print(f"file not specified")
+    exit(1)
+
+try:
+    with open(json_file, encoding="utf-8") as json_fh:
+        try:
+            json_data = (json.load(json_fh))
+        except json.decoder.JSONDecodeError as e_jerr:
+            print(f"json error n file {json_file}: ({e_jerr})")
+            exit(1)
+except FileNotFoundError as e_ferr:
+    print(f"file not found ({e_ferr})")
+    exit(1)
+except PermissionError as e_ferr:
+    print(f"permisson error ({e_ferr})")
+    exit(1)
+
+if not(quiet):
+    print(json_data)
+    
+
diff --git a/test/SAPHanaSR-testCluster b/test/SAPHanaSR-testCluster
index 61931ca9..804a6f24 100755
--- a/test/SAPHanaSR-testCluster
+++ b/test/SAPHanaSR-testCluster
@@ -7,7 +7,7 @@
  SAPHanaSR-testCluster
  Author:       Fabian Herschel, Mar 2023
  License:      GNU General Public License (GPL)
- Copyright:    (c) 2023 SUSE LLC
+ Copyright:    (c) 2023,2024 SUSE LLC
 """
 
 # pylint: disable=unused-import
@@ -142,7 +142,8 @@ while test01.run['count'] <= test01.config['repeat']:
             )
     test01.message(l_msg)
 
-    test01.read_test_file()
+    if test01.read_test_file() != 0:
+        sys.exit (1)
     ### debug exit after printing test properties
     if test01.config['printTestProperties'] is True:
         p_msg = (
diff --git a/test/filter_sap_trc_by_time b/test/filter_sap_trc_by_time
new file mode 100644
index 00000000..47e28f29
--- /dev/null
+++ b/test/filter_sap_trc_by_time
@@ -0,0 +1,45 @@
+#!/usr/bin/python3
+#
+"""
+ filter_sap_trc_by_time
+ Author: Fabian Herschel
+ License:      GNU General Public License (GPL)
+ Copyright:    (c) 2024 SUSE LLC
+
+ SAP timestamps are looking like:
+ 2024-01-17 16:17:30.891505
+ %Y   %m %d %H %M %S %f
+"""
+#
+##################
+#
+# first step for today - filter a sap timestamp which should be between a start and a top reference time
+# all time stamps (in sap trace message, start-timepoint and stop-timepoint must match the format %Y-%m-%d %H:%M:%S.%f
+# TODO: for start and endtime also allow "%Y-%m-%d", "%H:%M:%S", %H:%M",    "%Y-%m-%d %H:%M:%S" and "%Y-%m-%d %H:%M"
+#                                        day         time        time_short day_time                day_time_short
+#
+# second step get message lines from SPA HANA trace file
+# TODO: read trace line by line
+# TODO: search/match for a SAP-trace-timestring like %Y-%m-%d %H:%M:%S.%f
+#
+# third step command line parameter handling (argparse)
+# TODO: tracefile, starttime, endtime
+
+import datetime
+
+format_time_scan = "%Y-%m-%d %H:%M:%S.%f"
+filter_time_begin = "2024-01-17 15:00:00.0"
+filter_time_end = "2024-01-17 17:00:00.0"
+
+sap_time_string = "2024-01-17 17:00:00.0"
+#sap_time_string = "2024-01-17 17:00:00"
+
+filter_time_begin_ts = int(datetime.datetime.strptime(filter_time_begin, format_time_scan).timestamp())
+filter_time_end_ts = int(datetime.datetime.strptime(filter_time_end, format_time_scan).timestamp())
+
+sap_time_ts = int(datetime.datetime.strptime(sap_time_string, format_time_scan).timestamp())
+
+if filter_time_begin_ts <= sap_time_ts <= filter_time_end_ts:
+    print(f"message from time {sap_time_string} will be printed")
+
+
diff --git a/test/fix_indent b/test/fix_indent
new file mode 100644
index 00000000..4bc71530
--- /dev/null
+++ b/test/fix_indent
@@ -0,0 +1,10 @@
+
+file="$1"
+
+awk '{ p=0 } 
+     /^ {3}[^ ]/ { p=1 } 
+     /^ {7}[^ ]/ { p=1 } 
+     /^ {11}[^ ]/ { p=1 } 
+     /^ {15}[^ ]/ { p=1 }  
+     { if(p==1) {printf " "} 
+     {print $0} }' "$file" > "$file".ident
diff --git a/test/fix_indent.txt b/test/fix_indent.txt
new file mode 100644
index 00000000..c61355c0
--- /dev/null
+++ b/test/fix_indent.txt
@@ -0,0 +1,6 @@
+
+ 1334  for j in *json; do bash ../../fix_indent "$j" ; done
+ 1335  for f in *json; do mv "$f".ident "$f"; done
+ 1336  git status 
+ 1337  git pull && git commit -m "test/json/angi-ScaleOut-BW - fix indents (1,5,9,13,17) of lines" . && git push
+
diff --git a/test/json/angi-ScaleOut-BW/block_manual_takeover.json b/test/json/angi-ScaleOut-BW/block_manual_takeover.json
index 4a66bcff..41863d25 100644
--- a/test/json/angi-ScaleOut-BW/block_manual_takeover.json
+++ b/test/json/angi-ScaleOut-BW/block_manual_takeover.json
@@ -3,40 +3,40 @@
     "name": "blocked manual takeover",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "bmt",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "bmt",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/defaults+newComparators.json b/test/json/angi-ScaleOut-BW/defaults+newComparators.json
index 44699c70..1287f744 100644
--- a/test/json/angi-ScaleOut-BW/defaults+newComparators.json
+++ b/test/json/angi-ScaleOut-BW/defaults+newComparators.json
@@ -1,66 +1,66 @@
 {
     "checkPtr": {
-           "comparartorinline": [
+            "comparartorinline": [
                 "alfa!=dassollungleichsein",
                 "lpa_@@sid@@_lpt > 160000",
                 "beta=dassollgleichsein"
-           ],
-           "comparatortuple": [
-               ("noty", "alfa=ungleich"),
-               ()
-           ],
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
+            ],
+            "comparatortuple": [
+                ("noty", "alfa=ungleich"),
+                ()
+            ],
+            "globalUp": [
+                "topology=ScaleOut"
+            ],
+            "pHostUp": [
+                "clone_state=PROMOTED",
+                "roles=master1:master:worker:master",
+                "score=150"
+            ],
+            "pSiteUp": [
                 "lpt=1[6-9]........",
                 "lss=4",
                 "srr=P",
                 "srHook=PRIM",
                 "srPoll=PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt=30",
                 "lss=4",
-               "srr=S",
+                "srr=S",
                 "srHook=SOK",
                 "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles=master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state=DEMOTED",
+                "roles=master1:master:worker:master",
+                "score=100"
+            ],
+            "pHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
             "pSiteDown": [
                 "lpt=1[6-9]........" ,
                 "lss=1" ,
                 "srr=P" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
         }
 }
diff --git a/test/json/angi-ScaleOut-BW/defaults.json b/test/json/angi-ScaleOut-BW/defaults.json
index aabce016..fb1840a6 100644
--- a/test/json/angi-ScaleOut-BW/defaults.json
+++ b/test/json/angi-ScaleOut-BW/defaults.json
@@ -2,58 +2,58 @@
     "opMode": "logreplay",
     "srMode": "sync",
     "checkPtr": {
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
+            "globalUp": [
+                "topology=ScaleOut"
+            ],
+            "pHostUp": [
+                "clone_state=PROMOTED",
+                "roles=master1:master:worker:master",
+                "score=150"
+            ],
+            "pSiteUp": [
                 "lpt=1[6-9]........",
                 "lss=4",
                 "srr=P",
                 "srHook=PRIM",
                 "srPoll=PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt=30",
                 "lss=4",
-               "srr=S",
+                "srr=S",
                 "srHook=SOK",
                 "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles=master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state=DEMOTED",
+                "roles=master1:master:worker:master",
+                "score=100"
+            ],
+            "pHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
             "pSiteDown": [
                 "lpt=1[6-9]........" ,
                 "lss=1" ,
                 "srr=P" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
         }
 }
diff --git a/test/json/angi-ScaleOut-BW/free_log_area.json b/test/json/angi-ScaleOut-BW/free_log_area.json
index 3de2d553..f1708d42 100644
--- a/test/json/angi-ScaleOut-BW/free_log_area.json
+++ b/test/json/angi-ScaleOut-BW/free_log_area.json
@@ -3,40 +3,40 @@
     "name": "free log area on primary",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_free_log_area",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "still running",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 60",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 1,
-           "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_free_log_area",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "still running",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 60",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_prim_indexserver.json b/test/json/angi-ScaleOut-BW/kill_prim_indexserver.json
index 3972ac33..e3f7bb18 100644
--- a/test/json/angi-ScaleOut-BW/kill_prim_indexserver.json
+++ b/test/json/angi-ScaleOut-BW/kill_prim_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,43 +54,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=SOK"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_prim_inst.json b/test/json/angi-ScaleOut-BW/kill_prim_inst.json
index c4c1fa98..b56e53e4 100644
--- a/test/json/angi-ScaleOut-BW/kill_prim_inst.json
+++ b/test/json/angi-ScaleOut-BW/kill_prim_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,26 +29,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -56,43 +56,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=SOK"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_prim_worker_inst.json b/test/json/angi-ScaleOut-BW/kill_prim_worker_inst.json
index 38a258bf..25456e24 100644
--- a/test/json/angi-ScaleOut-BW/kill_prim_worker_inst.json
+++ b/test/json/angi-ScaleOut-BW/kill_prim_worker_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,26 +29,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -56,43 +56,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:",
-               "score=(90|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=SOK"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:",
+                "score=(90|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_prim_worker_node.json b/test/json/angi-ScaleOut-BW/kill_prim_worker_node.json
index dc96bab2..36fc3c5a 100644
--- a/test/json/angi-ScaleOut-BW/kill_prim_worker_node.json
+++ b/test/json/angi-ScaleOut-BW/kill_prim_worker_node.json
@@ -3,19 +3,19 @@
     "name": "Kill primary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=(1[6-9]........|20|10)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=(S|P)",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|WAITING4NODES)" ,
-               "roles=master1::worker:" ,
-               "score=(70|5)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|WAITING4NODES)" ,
+                "roles=master1::worker:" ,
+                "score=(70|5)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=(1|2)",
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=(PRIM|SFAIL)"
-           ],
+                "lss=(1|2)",
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=(PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145|150)",
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145|150)",
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_secn_indexserver.json b/test/json/angi-ScaleOut-BW/kill_secn_indexserver.json
index 9d14c833..4f500059 100644
--- a/test/json/angi-ScaleOut-BW/kill_secn_indexserver.json
+++ b/test/json/angi-ScaleOut-BW/kill_secn_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SFAIL",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sCCC to be the same as at test begin",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SFAIL",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sCCC to be the same as at test begin",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_secn_inst.json b/test/json/angi-ScaleOut-BW/kill_secn_inst.json
index 53f2cfce..ac57eb18 100644
--- a/test/json/angi-ScaleOut-BW/kill_secn_inst.json
+++ b/test/json/angi-ScaleOut-BW/kill_secn_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +54,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_secn_node.json b/test/json/angi-ScaleOut-BW/kill_secn_node.json
index 3df7a74c..a5febca2 100644
--- a/test/json/angi-ScaleOut-BW/kill_secn_node.json
+++ b/test/json/angi-ScaleOut-BW/kill_secn_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,21 +27,21 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -49,41 +49,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_secn_worker_inst.json b/test/json/angi-ScaleOut-BW/kill_secn_worker_inst.json
index 4fdb3665..2516f033 100644
--- a/test/json/angi-ScaleOut-BW/kill_secn_worker_inst.json
+++ b/test/json/angi-ScaleOut-BW/kill_secn_worker_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +54,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/kill_secn_worker_node.json b/test/json/angi-ScaleOut-BW/kill_secn_worker_node.json
index f819f8fc..e0696383 100644
--- a/test/json/angi-ScaleOut-BW/kill_secn_worker_node.json
+++ b/test/json/angi-ScaleOut-BW/kill_secn_worker_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,24 +27,24 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=WAITING4NODES" 
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=WAITING4NODES" 
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -52,41 +52,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/maintenance_cluster_turn_hana.json b/test/json/angi-ScaleOut-BW/maintenance_cluster_turn_hana.json
index 15aacfa3..cdf90e80 100644
--- a/test/json/angi-ScaleOut-BW/maintenance_cluster_turn_hana.json
+++ b/test/json/angi-ScaleOut-BW/maintenance_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "maintenance_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_maintenance_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_maintenance_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/maintenance_with_standby_nodes.json b/test/json/angi-ScaleOut-BW/maintenance_with_standby_nodes.json
index 07cbab5e..f9755425 100644
--- a/test/json/angi-ScaleOut-BW/maintenance_with_standby_nodes.json
+++ b/test/json/angi-ScaleOut-BW/maintenance_with_standby_nodes.json
@@ -5,19 +5,19 @@
     "sid": "HA1",
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites ssn",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites ssn",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "secondary site: node is standby",
             "next": "step30",
@@ -26,10 +26,10 @@
             "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
-           "pHost": "pHostUp",
-           "sHost": "sHostDown"
-       },
-       {
+            "pHost": "pHostUp",
+            "sHost": "sHostDown"
+        },
+        {
             "step": "step30",
             "name": "secondary site: node back online",
             "next": "step40",
@@ -38,43 +38,43 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "step40",
-           "name": "end recover",
-           "next": "step110",
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "step40",
+            "name": "end recover",
+            "next": "step110",
             "loop": 120,
             "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step110",
-           "name": "test prerequitsites spn",
-           "next": "step120",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step110",
+            "name": "test prerequitsites spn",
+            "next": "step120",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step120",
             "name": "primary site: node is standby",
             "next": "step130",
@@ -87,15 +87,15 @@
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": "pHostDown",
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostDown",
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step130",
             "name": "takeover on secondary",
             "next": "final140",
@@ -103,33 +103,33 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
             ],
             "sSite": "pSiteUp",
             "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
             ],
             "sHost": "pHostUp"
-       },
-       {
-           "step": "final140",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        },
+        {
+            "step": "final140",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/nop-false.json b/test/json/angi-ScaleOut-BW/nop-false.json
index a3c5ad48..46924104 100644
--- a/test/json/angi-ScaleOut-BW/nop-false.json
+++ b/test/json/angi-ScaleOut-BW/nop-false.json
@@ -3,31 +3,31 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": [
-               "topology=Nix"
-           ],
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": [
+                "topology=Nix"
+            ],
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/nop.json b/test/json/angi-ScaleOut-BW/nop.json
index e3d9826e..31d4111e 100644
--- a/test/json/angi-ScaleOut-BW/nop.json
+++ b/test/json/angi-ScaleOut-BW/nop.json
@@ -3,29 +3,29 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": "globalUp",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": "globalUp",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/restart_cluster.json b/test/json/angi-ScaleOut-BW/restart_cluster.json
index 7018fdd2..c59f8e20 100644
--- a/test/json/angi-ScaleOut-BW/restart_cluster.json
+++ b/test/json/angi-ScaleOut-BW/restart_cluster.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/restart_cluster_hana_running.json b/test/json/angi-ScaleOut-BW/restart_cluster_hana_running.json
index b7a20ca7..25ebf149 100644
--- a/test/json/angi-ScaleOut-BW/restart_cluster_hana_running.json
+++ b/test/json/angi-ScaleOut-BW/restart_cluster_hana_running.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster_hana_running",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_hana_running",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_hana_running",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/restart_cluster_turn_hana.json b/test/json/angi-ScaleOut-BW/restart_cluster_turn_hana.json
index cd398f38..fc1a482a 100644
--- a/test/json/angi-ScaleOut-BW/restart_cluster_turn_hana.json
+++ b/test/json/angi-ScaleOut-BW/restart_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "restart_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/standby_prim_node.json b/test/json/angi-ScaleOut-BW/standby_prim_node.json
index 765654ad..1e047088 100644
--- a/test/json/angi-ScaleOut-BW/standby_prim_node.json
+++ b/test/json/angi-ScaleOut-BW/standby_prim_node.json
@@ -3,19 +3,19 @@
     "name": "standby primary node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -27,27 +27,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(30|1[6-9]........)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "takeover on secondary",
             "next": "final40",
@@ -55,43 +55,43 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
+            ],
             "sSite": [
-               "lpt=1[6-9]........",
-               "lss=4",
-               "srr=P",
-               "srHook=PRIM",
-               "srPoll=PRIM"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "todo": "allow pointer to prereq10",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=1[6-9]........",
+                "lss=4",
+                "srr=P",
+                "srHook=PRIM",
+                "srPoll=PRIM"
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "todo": "allow pointer to prereq10",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut-BW/standby_secn_node.json b/test/json/angi-ScaleOut-BW/standby_secn_node.json
index 686e3063..ae59404c 100644
--- a/test/json/angi-ScaleOut-BW/standby_secn_node.json
+++ b/test/json/angi-ScaleOut-BW/standby_secn_node.json
@@ -5,19 +5,19 @@
     "sid": "HA1",
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -30,27 +30,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
+        },
+        {
             "step": "step30",
             "name": "node back online",
             "next": "final40",
@@ -58,41 +58,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/block_manual_takeover.json b/test/json/angi-ScaleOut/block_manual_takeover.json
index 5896d13c..a166fe2d 100644
--- a/test/json/angi-ScaleOut/block_manual_takeover.json
+++ b/test/json/angi-ScaleOut/block_manual_takeover.json
@@ -3,40 +3,44 @@
     "name": "block manual takeover, using susTkOver.py",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "bmt",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "bmt",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+	    "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "step20",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/defaults+newComparators.json b/test/json/angi-ScaleOut/defaults+newComparators.json
deleted file mode 100644
index 30ba4d74..00000000
--- a/test/json/angi-ScaleOut/defaults+newComparators.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "checkPtr": {
-           "comparartorinline": [
-                "alfa != dassollungleichsein",
-                "lpa_@@sid@@_lpt > 160000",
-                "beta == dassollgleichsein",
-                "gamma >? 20000:(detla|epsilon)"
-           ],
-           "comparator1": [
-               "key comp value",
-               "lpt >= 1699606819",
-               "lpt >= 1699606819:(20|30)",
-               "lss like [1-4]",
-               "lss ~ [1-4]",
-               "lss !~ [1-4]",
-               "srHook is None"
-           ],
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
-                "lpt >= 1699606819",
-                "lss=4",
-                "srr=P",
-                "srHook=PRIM",
-                "srPoll=PRIM"
-           ],
-           "sSiteUp": [
-                "lpt=30",
-                "lss=4",
-               "srr=S",
-                "srHook=SOK",
-                "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles ~ master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-            "pSiteDown": [
-                "lpt=1[6-9]........" ,
-                "lss=1" ,
-                "srr=P" ,
-                "srHook=PRIM" ,
-                "srPoll=PRIM"
-           ],
-           "sSiteDown": [
-                "lpt=10",
-                "lss=1",
-                "srr=S",
-                "srHook=SFAIL",
-                "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
-        }
-}
diff --git a/test/json/angi-ScaleOut/defaults.json b/test/json/angi-ScaleOut/defaults.json
index da941cf6..3491593e 100644
--- a/test/json/angi-ScaleOut/defaults.json
+++ b/test/json/angi-ScaleOut/defaults.json
@@ -2,58 +2,68 @@
     "opMode": "logreplay",
     "srMode": "sync",
     "checkPtr": {
-           "globalUp": [
-               "topology = ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "pSiteUp": [
+            "globalUp": [
+                "topology == ScaleOut"
+            ],
+            "pHostUp": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "pSiteUp": [
                 "lpt > 1000000000",
                 "lss == 4",
                 "srr == P",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt == 30",
                 "lss == 4",
-               "srr == S",
+                "srr == S",
                 "srHook == SOK",
                 "srPoll == SOK"
-           ],
-           "sHostUp": [
-               "clone_state == DEMOTED",
-               "roles == master1:master:worker:master",
-               "score == 100"
-           ],
-           "pHostDown": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score == 150",
-               "standby == on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state == DEMOTED",
+                "roles == master1:master:worker:master",
+                "score == 100"
+            ],
+            "pHostDown": [
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score == 150",
+                "standby == on"
+            ],
             "pSiteDown": [
                 "lpt > 1000000000",
                 "lss == 1",
                 "srr == P",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt == 10",
                 "lss == 1",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score == 100",
-               "standby == on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score == 100",
+                "standby == on"
+            ],
+	    "pWorkerUp": [
+                "clone_state == DEMOTED",
+                "roles == slave:slave:worker:slave",
+                "score == -12200"
+            ],
+	    "sWorkerUp": [
+                "clone_state == DEMOTED",
+                "roles == slave:slave:worker:slave",
+                "score == -12200"
+            ]
         }
 }
diff --git a/test/json/angi-ScaleOut/flap.json b/test/json/angi-ScaleOut/flap.json
new file mode 100644
index 00000000..f15e2308
--- /dev/null
+++ b/test/json/angi-ScaleOut/flap.json
@@ -0,0 +1,41 @@
+{
+    "test": "flap",
+    "name": "flap - test the new test parser",
+    "start": "prereq10",
+    "steps": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 4",
+            "pSite": [
+                "lpt >~ 2000000000:^(20|30|1.........)$",
+                "lss == 4",
+                "srr == P",
+                "srHook == PRIM",
+                "srPoll == PRIM",
+                "hugo is None"
+            ],
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
+    ]
+}
diff --git a/test/json/angi-ScaleOut/flop.json b/test/json/angi-ScaleOut/flop.json
new file mode 100644
index 00000000..8d46d927
--- /dev/null
+++ b/test/json/angi-ScaleOut/flop.json
@@ -0,0 +1,42 @@
+{
+    "test": "flop",
+    "name": "flop - this test should NOT pass successfully",
+    "start": "prereq10",
+    "steps": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 4",
+            "pSite": [
+                "lpt >~ 2000000000:^(20|30|1.........)$",
+                "lss == 4",
+                "srr == P",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": [
+                "lpt is None"
+            ],
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
+    ]
+}
diff --git a/test/json/angi-ScaleOut/flup.json b/test/json/angi-ScaleOut/flup.json
new file mode 100644
index 00000000..f5bc3936
--- /dev/null
+++ b/test/json/angi-ScaleOut/flup.json
@@ -0,0 +1,34 @@
+{
+    "test": "flup",
+    "name": "flup - like nop but very short sleep only - only for checking the test engine",
+    "start": "prereq10",
+    "steps": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 4",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
+    ]
+}
diff --git a/test/json/angi-ScaleOut/free_log_area.json b/test/json/angi-ScaleOut/free_log_area.json
index 3de2d553..a5ceb60e 100644
--- a/test/json/angi-ScaleOut/free_log_area.json
+++ b/test/json/angi-ScaleOut/free_log_area.json
@@ -1,42 +1,47 @@
 {
     "test": "free_log_area",
-    "name": "free log area on primary",
+    "name": "free hana log area on primary site",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_free_log_area",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "still running",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 60",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 1,
-           "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_free_log_area",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+
+        },
+        {
+            "step": "step20",
+            "name": "still running",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 60",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/freeze_prim_master_nfs.json b/test/json/angi-ScaleOut/freeze_prim_master_nfs.json
index 31455dc6..c2fa374e 100644
--- a/test/json/angi-ScaleOut/freeze_prim_master_nfs.json
+++ b/test/json/angi-ScaleOut/freeze_prim_master_nfs.json
@@ -3,19 +3,21 @@
     "name": "freeze sap hana nfs on primary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_freeze_prim_master_nfs",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_freeze_prim_master_nfs",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -26,23 +28,23 @@
                 "lpt >~ 1000000000:(20|10)",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -50,41 +52,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss ~ (1|2)",
-               "srr ~ (P|S)",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll ~ (PRIM|SFAIL)"
-           ],
+                "lss ~ (1|2)",
+                "srr ~ (P|S)",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll ~ (PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
-               "roles == master1::worker:"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
+                "roles == master1::worker:"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/freeze_prim_site_nfs.json b/test/json/angi-ScaleOut/freeze_prim_site_nfs.json
index 27338cdd..2e0a1585 100644
--- a/test/json/angi-ScaleOut/freeze_prim_site_nfs.json
+++ b/test/json/angi-ScaleOut/freeze_prim_site_nfs.json
@@ -3,19 +3,21 @@
     "name": "freeze sap hana nfs on primary site",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_freeze_prim_site_nfs",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_freeze_prim_site_nfs",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -26,23 +28,23 @@
                 "lpt >~ 1000000000:(20|10)",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -50,41 +52,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss ~ (1|2)",
-               "srr ~ (P|S)",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll ~ (PRIM|SFAIL)"
-           ],
+                "lss ~ (1|2)",
+                "srr ~ (P|S)",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll ~ (PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
-               "roles == master1::worker:"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
+                "roles == master1::worker:"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+	    "sWorker": "pWorkerUp",
+            "pWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/freeze_secn_site_nfs.json b/test/json/angi-ScaleOut/freeze_secn_site_nfs.json
new file mode 100644
index 00000000..8f6fb90e
--- /dev/null
+++ b/test/json/angi-ScaleOut/freeze_secn_site_nfs.json
@@ -0,0 +1,96 @@
+{
+    "test": "freeze_secn_site_nfs",
+    "name": "freeze sap hana nfs on secondary site",
+    "todo": "please correct this file",
+    "start": "prereq10",
+    "steps": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_freeze_secn_site_nfs",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "step20",
+            "name": "failure detected",
+            "next": "step30",
+            "loop": 120,
+            "wait": 2,
+            "pSite": [
+                "srr == P",
+                "lpt > 1000000000",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
+            "sSite": [
+                "lpt ~ (20|10)",
+                "lss == 1",
+                "srr == S",
+                "srHook == SFAIL",
+                "srPoll == SFAIL"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+            ]
+        },
+        {
+            "step": "step30",
+            "name": "begin recover",
+            "next": "final40",
+            "loop": 300,
+            "wait": 2,
+            "todo": "pHost+sHost to check site-name",
+            "pSite": [
+                "lss == 4",
+                "srr == P",
+                "lpt > 1000000000",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
+            "sSite": [
+                "lpt ~ (20|10)",
+                "lss == 4",
+                "srr == S",
+                "srHook ~ (SOK|SWAIT)",
+                "srPoll ~ (SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|UNDEFINED)",
+                "roles == master1::worker:",
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+	    "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
+    ]
+}
diff --git a/test/json/angi-ScaleOut/kill_prim_indexserver.json b/test/json/angi-ScaleOut/kill_prim_indexserver.json
index 7bb34bbe..f9cd45ac 100644
--- a/test/json/angi-ScaleOut/kill_prim_indexserver.json
+++ b/test/json/angi-ScaleOut/kill_prim_indexserver.json
@@ -1,21 +1,23 @@
 {
     "test": "kill_prim_indexserver",
-    "name": "Kill primary indexserver",
+    "name": "Kill primary master indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,26 +30,26 @@
                 "lpt >~ 1000000000:20",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
-               "roles == master1::worker:",
-               "score ~ (90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
+                "roles == master1::worker:",
+                "score ~ (90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -55,43 +57,45 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 1",
-               "srr == P",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll == PRIM"
-           ],
+                "lss == 1",
+                "srr == P",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "roles == master1::worker:",
-               "score ~ (90|70|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)",
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "roles == master1::worker:",
+                "score ~ (90|70|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)",
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+	    "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_prim_inst.json b/test/json/angi-ScaleOut/kill_prim_inst.json
index 894e1479..3443c7cc 100644
--- a/test/json/angi-ScaleOut/kill_prim_inst.json
+++ b/test/json/angi-ScaleOut/kill_prim_inst.json
@@ -1,22 +1,24 @@
 {
     "test": "kill_prim_inst",
-    "name": "Kill primary instance",
+    "name": "Kill primary master instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite = @@pSite@@ or pSite = %pSite",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite = @@pSite@@ or pSite = %pSite",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,26 +31,26 @@
                 "lpt >~ 1000000000:20",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
-               "roles == master1::worker:",
-               "score ~ (90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
+                "roles == master1::worker:",
+                "score ~ (90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -56,43 +58,45 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss = 1",
-               "srr = P",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll == PRIM"
-           ],
+                "lss == 1",
+                "srr == P",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "roles ~ master1::worker:",
-               "score ~ (90|70|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)",
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "roles ~ master1::worker:",
+                "score ~ (90|70|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)",
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_prim_node.json b/test/json/angi-ScaleOut/kill_prim_node.json
index 0ee081c9..3445fa23 100644
--- a/test/json/angi-ScaleOut/kill_prim_node.json
+++ b/test/json/angi-ScaleOut/kill_prim_node.json
@@ -3,19 +3,21 @@
     "name": "Kill primary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,23 +29,23 @@
                 "lpt >~ 1000000000:(20|10)",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -51,41 +53,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss ~ (1|2)",
-               "srr ~ (P|S)",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll ~ (PRIM|SFAIL)"
-           ],
+                "lss ~ (1|2)",
+                "srr ~ (P|S)",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll ~ (PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
-               "roles == master1::worker:"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
+                "roles == master1::worker:"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+	    "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_prim_worker_indexserver.json b/test/json/angi-ScaleOut/kill_prim_worker_indexserver.json
index d911a350..cedcf2b5 100644
--- a/test/json/angi-ScaleOut/kill_prim_worker_indexserver.json
+++ b/test/json/angi-ScaleOut/kill_prim_worker_indexserver.json
@@ -3,19 +3,21 @@
     "name": "Kill primary worker indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +29,25 @@
                 "lpt >~ 1000000000:20",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
-               "score ~ (90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
+                "score ~ (90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +56,44 @@
             "todo": "pHost+sHost to check site-name",
             "todo2": "why do we need SFAIL for srHook?",
             "pSite": [
-               "lss == 1",
-               "srr == P",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll == PRIM"
-           ],
+                "lss == 1",
+                "srr == P",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook ~ (PRIM|SFAIL)",
-               "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "score ~ (90|70|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)",
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook ~ (PRIM|SFAIL)",
+                "srPoll ~ (SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "score ~ (90|70|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)",
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_prim_worker_inst.json b/test/json/angi-ScaleOut/kill_prim_worker_inst.json
index fcfa7054..a28116b5 100644
--- a/test/json/angi-ScaleOut/kill_prim_worker_inst.json
+++ b/test/json/angi-ScaleOut/kill_prim_worker_inst.json
@@ -3,20 +3,22 @@
     "name": "Kill primary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_inst",
-           "todo": "allow something like pSite = @@pSite@@ or pSite = %pSite",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_inst",
+            "todo": "allow something like pSite = @@pSite@@ or pSite = %pSite",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,25 +30,25 @@
                 "lpt >~ 1000000000:20",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
-               "score ~ (90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)",
+                "score ~ (90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,43 +56,45 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 1",
-               "srr == P",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll == PRIM"
-           ],
+                "lss == 1",
+                "srr == P",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "roles == master1::worker:",
-               "score ~ (90|70|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)",
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "roles == master1::worker:",
+                "score ~ (90|70|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)",
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "sWorker": "pWorkerUp",
+            "pWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_prim_worker_node.json b/test/json/angi-ScaleOut/kill_prim_worker_node.json
index bcd4dac9..ceb77410 100644
--- a/test/json/angi-ScaleOut/kill_prim_worker_node.json
+++ b/test/json/angi-ScaleOut/kill_prim_worker_node.json
@@ -3,19 +3,21 @@
     "name": "Kill primary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +29,25 @@
                 "lpt >~ 1000000000:(20|10)",
                 "srHook ~ (PRIM|SWAIT|SREG)",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state ~ (DEMOTED|UNDEFINED|WAITING4NODES)",
-               "score ~ (90|70|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (DEMOTED|UNDEFINED|WAITING4NODES)",
+                "score ~ (90|70|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -53,41 +55,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss ~ (1|2)",
-               "srr ~ (P|S)",
-               "lpt >~ 1000000000:(30|20|10)",
-               "srHook ~ (PRIM|SWAIT|SREG)",
-               "srPoll ~ (PRIM|SFAIL)"
-           ],
+                "lss ~ (1|2)",
+                "srr ~ (P|S)",
+                "lpt >~ 1000000000:(30|20|10)",
+                "srHook ~ (PRIM|SWAIT|SREG)",
+                "srPoll ~ (PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
-               "roles == master1::worker:"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)",
+                "roles == master1::worker:"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "sWorker": "pWorkerUp",
+            "pWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_secn_indexserver.json b/test/json/angi-ScaleOut/kill_secn_indexserver.json
index e124f9d6..7f2350ab 100644
--- a/test/json/angi-ScaleOut/kill_secn_indexserver.json
+++ b/test/json/angi-ScaleOut/kill_secn_indexserver.json
@@ -1,21 +1,23 @@
 {
     "test": "kill_secn_indexserver",
-    "name": "Kill secondary indexserver",
+    "name": "Kill secondary master indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +29,26 @@
                 "lpt > 1000000000",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt ~ (10|30)",
                 "lss ~ (1|2)",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == DEMOTED",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == DEMOTED",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +56,44 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4",
-               "srr == P",
-               "lpt > 1000000000",
-               "srHook == PRIM",
-               "srPoll == PRIM"
-           ],
+                "lss == 4",
+                "srr == P",
+                "lpt > 1000000000",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss == 1",
-               "srr == S",
-               "srHook == SFAIL",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sCCC to be the same as at test begin",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss == 1",
+                "srr == S",
+                "srHook == SFAIL",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sCCC to be the same as at test begin",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_secn_inst.json b/test/json/angi-ScaleOut/kill_secn_inst.json
index e515afe6..5369a591 100644
--- a/test/json/angi-ScaleOut/kill_secn_inst.json
+++ b/test/json/angi-ScaleOut/kill_secn_inst.json
@@ -1,21 +1,23 @@
 {
     "test": "kill_secn_inst",
-    "name": "Kill secondary instance",
+    "name": "Kill secondary master instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +29,26 @@
                 "lpt > 1000000000",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt ~ (10|30)",
                 "lss ~ (1|2)",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == DEMOTED",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == DEMOTED",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +56,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4",
-               "srr == P",
-               "lpt > 1000000000",
-               "srHook == PRIM",
-               "srPoll == PRIM"
-           ],
+                "lss == 4",
+                "srr == P",
+                "lpt > 1000000000",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss ~ (1|2)",
-               "srr == S",
-               "srHook ~ (SFAIL|SWAIT)",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 240,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss ~ (1|2)",
+                "srr == S",
+                "srHook ~ (SFAIL|SWAIT)",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 240,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_secn_node.json b/test/json/angi-ScaleOut/kill_secn_node.json
index 81c108ef..5d532953 100644
--- a/test/json/angi-ScaleOut/kill_secn_node.json
+++ b/test/json/angi-ScaleOut/kill_secn_node.json
@@ -3,19 +3,21 @@
     "name": "Kill secondary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,21 +29,21 @@
                 "lpt > 1000000000",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt == 10",
                 "lss == 1",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -49,41 +51,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4",
-               "srr == P",
-               "lpt > 1000000000",
-               "srHook == PRIM",
-               "srPoll == PRIM"
-           ],
+                "lss == 4",
+                "srr == P",
+                "lpt > 1000000000",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss ~ (1|2)",
-               "srr == S",
-               "srHook ~ (SFAIL|SWAIT)",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss ~ (1|2)",
+                "srr == S",
+                "srHook ~ (SFAIL|SWAIT)",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_secn_worker_inst.json b/test/json/angi-ScaleOut/kill_secn_worker_inst.json
index 2cf0dd96..8daa3df4 100644
--- a/test/json/angi-ScaleOut/kill_secn_worker_inst.json
+++ b/test/json/angi-ScaleOut/kill_secn_worker_inst.json
@@ -3,19 +3,21 @@
     "name": "Kill secondary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,15 +30,15 @@
                 "srr == S",
                 "srHook ~ (SFAIL|SWAIT)",
                 "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state ~ (DEMOTED|UNDEFINED)",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state ~ (DEMOTED|UNDEFINED)",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -45,30 +47,32 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt == 10",
-               "lss ~ (1|2)",
-               "srr == S",
-               "srHook ~ (SFAIL|SWAIT)",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss ~ (1|2)",
+                "srr == S",
+                "srHook ~ (SFAIL|SWAIT)",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/kill_secn_worker_node.json b/test/json/angi-ScaleOut/kill_secn_worker_node.json
index d5c2acfe..1b32417c 100644
--- a/test/json/angi-ScaleOut/kill_secn_worker_node.json
+++ b/test/json/angi-ScaleOut/kill_secn_worker_node.json
@@ -3,19 +3,21 @@
     "name": "Kill secondary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,13 +30,13 @@
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=WAITING4NODES" 
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=WAITING4NODES"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -43,30 +45,32 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)",
-               "roles=master1::worker:",
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)",
+                "roles=master1::worker:",
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/maintenance_cluster_turn_hana.json b/test/json/angi-ScaleOut/maintenance_cluster_turn_hana.json
index 15aacfa3..7f4409b1 100644
--- a/test/json/angi-ScaleOut/maintenance_cluster_turn_hana.json
+++ b/test/json/angi-ScaleOut/maintenance_cluster_turn_hana.json
@@ -1,32 +1,36 @@
 {
     "test": "maintenance_cluster_turn_hana",
-    "name": "maintenance_cluster_turn_hana",
+    "name": "maintenance cluster turn hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_maintenance_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_maintenance_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "sWorker": "pWorkerUp",
+            "pWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json b/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json
index 7f605584..0722acf8 100644
--- a/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json
+++ b/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json
@@ -4,19 +4,21 @@
     "start": "prereq10",
     "todo": "expectations needs to be fixed - e.g. step20 sHostDown is wrong, because topology will also be stopped. roles will be ::: not master1:...",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites standby_secn_node",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites standby_secn_node",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "secondary site: node is standby",
             "next": "step30",
@@ -25,10 +27,10 @@
             "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
-           "pHost": "pHostUp",
-           "sHost": "sHostDown"
-       },
-       {
+            "pHost": "pHostUp",
+            "sHost": "sHostDown"
+        },
+        {
             "step": "step30",
             "name": "secondary site: node back online",
             "next": "step40",
@@ -37,43 +39,43 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt == 10",
-               "lss == 1",
-               "srr == S",
-               "srHook == SWAIT",
-               "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state == DEMOTED",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "step40",
-           "name": "end recover",
-           "next": "step110",
+                "lpt == 10",
+                "lss == 1",
+                "srr == S",
+                "srHook == SWAIT",
+                "srPoll == SFAIL"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state == DEMOTED",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "step40",
+            "name": "end recover",
+            "next": "step110",
             "loop": 120,
             "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step110",
-           "name": "test prerequitsites standby_prim_node",
-           "next": "step120",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step110",
+            "name": "test prerequitsites standby_prim_node",
+            "next": "step120",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step120",
             "name": "primary site: node is standby",
             "next": "step130",
@@ -86,15 +88,15 @@
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll == SOK"
-           ],
-           "pHost": "pHostDown",
-           "sHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostDown",
+            "sHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step130",
             "name": "takeover on secondary",
             "next": "final140",
@@ -102,33 +104,35 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss == 1",
-               "srr == P",
-               "lpt == 10",
-               "srHook == SWAIT",
-               "srPoll == SFAIL"
+                "lss == 1",
+                "srr == P",
+                "lpt == 10",
+                "srHook == SWAIT",
+                "srPoll == SFAIL"
             ],
             "sSite": "pSiteUp",
             "pHost": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score == 150",
-               "standby == on"
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score == 150",
+                "standby == on"
             ],
             "sHost": "pHostUp"
-       },
-       {
-           "step": "final140",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        },
+        {
+            "step": "final140",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+	    "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/nop-false.json b/test/json/angi-ScaleOut/nop-false.json
index a3c5ad48..620e0d86 100644
--- a/test/json/angi-ScaleOut/nop-false.json
+++ b/test/json/angi-ScaleOut/nop-false.json
@@ -3,31 +3,35 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": [
-               "topology=Nix"
-           ],
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": [
+                "topology=Nix"
+            ],
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/nop.json b/test/json/angi-ScaleOut/nop.json
index e3d9826e..a87d22f6 100644
--- a/test/json/angi-ScaleOut/nop.json
+++ b/test/json/angi-ScaleOut/nop.json
@@ -3,29 +3,33 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": "globalUp",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": "globalUp",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/restart_cluster.json b/test/json/angi-ScaleOut/restart_cluster.json
index 7018fdd2..71e78328 100644
--- a/test/json/angi-ScaleOut/restart_cluster.json
+++ b/test/json/angi-ScaleOut/restart_cluster.json
@@ -1,31 +1,35 @@
 {
     "test": "restart_cluster",
-    "name": "restart_cluster",
+    "name": "stop and restart cluster and hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_restart_cluster",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/restart_cluster_hana_running.json b/test/json/angi-ScaleOut/restart_cluster_hana_running.json
index b7a20ca7..f48f0584 100644
--- a/test/json/angi-ScaleOut/restart_cluster_hana_running.json
+++ b/test/json/angi-ScaleOut/restart_cluster_hana_running.json
@@ -1,31 +1,35 @@
 {
     "test": "restart_cluster_hana_running",
-    "name": "restart_cluster_hana_running",
+    "name": "stop and restart cluster, keep hana running",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_hana_running",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_restart_cluster_hana_running",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+	   "sWorker": "sWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/restart_cluster_turn_hana.json b/test/json/angi-ScaleOut/restart_cluster_turn_hana.json
index cd398f38..9bec9239 100644
--- a/test/json/angi-ScaleOut/restart_cluster_turn_hana.json
+++ b/test/json/angi-ScaleOut/restart_cluster_turn_hana.json
@@ -1,32 +1,36 @@
 {
     "test": "restart_cluster_turn_hana",
-    "name": "restart_cluster_turn_hana",
+    "name": "stop cluster, turn hana, start cluster",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_restart_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/standby_prim_node.json b/test/json/angi-ScaleOut/standby_prim_node.json
index 1b4937db..b438e700 100644
--- a/test/json/angi-ScaleOut/standby_prim_node.json
+++ b/test/json/angi-ScaleOut/standby_prim_node.json
@@ -1,21 +1,23 @@
 {
     "test": "standby_prim_node",
-    "name": "standby primary node (and online again)",
+    "name": "standby primary master node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -27,27 +29,27 @@
                 "lpt > 1000000000",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll == SOK"
-           ],
-           "pHost": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score == 150",
-               "standby == on"
-           ],
-           "sHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score == 150",
+                "standby == on"
+            ],
+            "sHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "takeover on secondary",
             "next": "final40",
@@ -55,43 +57,45 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss == 1",
-               "srr == P",
-               "lpt == 10",
-               "srHook == SWAIT",
-               "srPoll == SFAIL"
-           ],
+                "lss == 1",
+                "srr == P",
+                "lpt == 10",
+                "srHook == SWAIT",
+                "srPoll == SFAIL"
+            ],
             "sSite": [
-               "lpt > 1000000000",
-               "lss == 4",
-               "srr == P",
-               "srHook == PRIM",
-               "srPoll == PRIM"
-           ],
-           "pHost": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score == 150",
-               "standby == on"
-           ],
-           "sHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "todo": "allow pointer to prereq10",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt > 1000000000",
+                "lss == 4",
+                "srr == P",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
+            "pHost": [
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score == 150",
+                "standby == on"
+            ],
+            "sHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "todo": "allow pointer to prereq10",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp",
+            "pWorker": "sWorkerUp",
+            "sWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/standby_secn_node.json b/test/json/angi-ScaleOut/standby_secn_node.json
index c573f71b..d76426c3 100644
--- a/test/json/angi-ScaleOut/standby_secn_node.json
+++ b/test/json/angi-ScaleOut/standby_secn_node.json
@@ -1,21 +1,24 @@
 {
     "test": "standby_secn_node",
-    "name": "standby secondary node (and online again)",
+    "name": "standby secondary master node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -28,27 +31,27 @@
                 "lpt > 1000000000",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt == 10",
                 "lss == 1",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == UNDEFINED",
-               "roles == master1::worker:",
-               "score == 100",
-               "standby == on"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == UNDEFINED",
+                "roles == master1::worker:",
+                "score == 100",
+                "standby == on"
+            ]
+        },
+        {
             "step": "step30",
             "name": "node back online",
             "next": "final40",
@@ -56,41 +59,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4",
-               "srr == P",
-               "lpt > 1000000000",
-               "srHook == PRIM",
-               "srPoll == PRIM"
-           ],
+                "lss == 4",
+                "srr == P",
+                "lpt > 1000000000",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss == 1",
-               "srr == S",
-               "srHook == SWAIT",
-               "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == DEMOTED",
-               "roles == master1::worker:",
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss == 1",
+                "srr == S",
+                "srHook == SWAIT",
+                "srPoll == SFAIL"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == DEMOTED",
+                "roles == master1::worker:",
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": "sWorkerUp",
+            "pWorker": "pWorkerUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleOut/standby_secn_worker_node.json b/test/json/angi-ScaleOut/standby_secn_worker_node.json
new file mode 100644
index 00000000..301a062d
--- /dev/null
+++ b/test/json/angi-ScaleOut/standby_secn_worker_node.json
@@ -0,0 +1,71 @@
+{
+    "test": "standby_secn_worker_node",
+    "name": "standby secondary worker node (and online again)",
+    "start": "prereq10",
+    "steps": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "standby_secn_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        },
+        {
+            "step": "step20",
+            "name": "node is standby",
+	    "next": "step30",
+            "loop": 120,
+            "wait": 2,
+            "post": "online_secn_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "sWorker": [
+                "clone_state == UNDEFINED",
+                "roles == slave:slave:worker:slave",
+                "score == -12200",
+                "standby == on"
+            ]
+        },
+        {
+            "step": "step30",
+            "name": "node back online",
+            "next": "final40",
+            "loop": 120,
+            "wait": 2,
+            "todo": "pHost+sHost to check site-name",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+	    "sWorker": [
+                "clone_state == DEMOTED",
+                "roles == slave:slave:worker:slave",
+                "score == -12200",
+                "standby == off"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp",
+            "pWorker": "pWorkerUp",
+            "sWorker": "sWorkerUp"
+        }
+    ]
+}
diff --git a/test/json/angi-ScaleUp/block_manual_takeover.json b/test/json/angi-ScaleUp/block_manual_takeover.json
index 4a66bcff..41863d25 100644
--- a/test/json/angi-ScaleUp/block_manual_takeover.json
+++ b/test/json/angi-ScaleUp/block_manual_takeover.json
@@ -3,40 +3,40 @@
     "name": "blocked manual takeover",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "bmt",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "bmt",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/block_sr.json b/test/json/angi-ScaleUp/block_sr.json
index 59220fc8..25b448be 100644
--- a/test/json/angi-ScaleUp/block_sr.json
+++ b/test/json/angi-ScaleUp/block_sr.json
@@ -3,43 +3,43 @@
     "name": "block sr and check SFAIL attribute; unblock to recover",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_block_sap_hana_sr",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "check SFAIL",
-           "next": "final40",
-           "loop": 30,
-           "wait": 2,
-           "post": "shell sct_test_unblock_sap_hana_sr",
-           "pSite": "pSiteUp",
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_block_sap_hana_sr",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "check SFAIL",
+            "next": "final40",
+            "loop": 30,
+            "wait": 2,
+            "post": "shell sct_test_unblock_sap_hana_sr",
+            "pSite": "pSiteUp",
             "sSite": [
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            ],
+            "pHost": "pHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/block_sr_and_freeze_prim_fs.json b/test/json/angi-ScaleUp/block_sr_and_freeze_prim_fs.json
index 0ee48e5d..3175e217 100644
--- a/test/json/angi-ScaleUp/block_sr_and_freeze_prim_fs.json
+++ b/test/json/angi-ScaleUp/block_sr_and_freeze_prim_fs.json
@@ -3,88 +3,88 @@
     "name": "block_sr_and_freeze_prim_fs",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_block_sap_hana_sr",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "check SFAIL",
-           "next": "step30",
-           "loop": 30,
-           "wait": 2,
-           "post": "shell sct_test_freeze_prim_fs",
-           "pSite": "pSiteUp",
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_block_sap_hana_sr",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "check SFAIL",
+            "next": "step30",
+            "loop": 30,
+            "wait": 2,
+            "post": "shell sct_test_freeze_prim_fs",
+            "pSite": "pSiteUp",
             "sSite": [
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp"
-       },
-       {
-           "step": "step30",
-           "name": "wait with frozen fs",
-           "next": "step35",
-           "loop": 30,
-           "wait": 2,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
+            ],
+            "pHost": "pHostUp"
+        },
+        {
+            "step": "step30",
+            "name": "wait with frozen fs",
+            "next": "step35",
+            "loop": 30,
+            "wait": 2,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
             "sSite": [
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp"
-       },
-       {
-           "step": "step35",
-           "name": "unfreeze fs",
-           "next": "step37",
-           "loop": 30,
-           "wait": 2,
-           "post": "shell sct_test_unfreeze_prim_fs",
-           "pSite": "pSiteUp",
+            ],
+            "pHost": "pHostUp"
+        },
+        {
+            "step": "step35",
+            "name": "unfreeze fs",
+            "next": "step37",
+            "loop": 30,
+            "wait": 2,
+            "post": "shell sct_test_unfreeze_prim_fs",
+            "pSite": "pSiteUp",
             "sSite": [
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp"
-       },
-       {
-           "step": "step37",
-           "name": "unblock sr",
-           "next": "final40",
-           "loop": 30,
-           "wait": 2,
-           "post": "shell sct_test_unblock_sap_hana_sr",
-           "pSite": "pSiteUp",
+            ],
+            "pHost": "pHostUp"
+        },
+        {
+            "step": "step37",
+            "name": "unblock sr",
+            "next": "final40",
+            "loop": 30,
+            "wait": 2,
+            "post": "shell sct_test_unblock_sap_hana_sr",
+            "pSite": "pSiteUp",
             "sSite": [
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "recovery",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            ],
+            "pHost": "pHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "recovery",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/defaults.json b/test/json/angi-ScaleUp/defaults.json
index 7c383408..041dd4a7 100644
--- a/test/json/angi-ScaleUp/defaults.json
+++ b/test/json/angi-ScaleUp/defaults.json
@@ -2,71 +2,71 @@
     "opMode": "logreplay",
     "srMode": "sync",
     "checkPtr": {
-           "globalUp": [
-               "topology == ScaleUp"
-           ],
-           "pHostUp": [
-               "clone_state == PROMOTED",
-               "roles == master1:master:worker:master",
-               "score == 150"
-           ],
-           "pSiteUp": [
+            "globalUp": [
+                "topology == ScaleUp"
+            ],
+            "pHostUp": [
+                "clone_state == PROMOTED",
+                "roles == master1:master:worker:master",
+                "score == 150"
+            ],
+            "pSiteUp": [
                 "lpt > 1000000000",
                 "lss == 4",
                 "srr == P",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
-           "pSiteUpDemo": [
+            ],
+            "pSiteUpDemo": [
                 "lpt > 1000000000",
                 "lss == 4",
                 "srr == P",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt == 30",
                 "lss == 4",
                 "srr == S",
                 "srHook == SOK",
                 "srPoll == SOK"
-           ],
-           "sSiteUpDemo": [
+            ],
+            "sSiteUpDemo": [
                 "lpt == 30",
                 "lss == 4",
                 "srr == S",
                 "srPoll == SOK"
-           ],
-           "sHostUp": [
-               "clone_state == DEMOTED",
-               "roles == master1:master:worker:master",
-               "score == 100"
-           ],
-           "pHostDown": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score == 150" ,
-               "standby == on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state == DEMOTED",
+                "roles == master1:master:worker:master",
+                "score == 100"
+            ],
+            "pHostDown": [
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score == 150" ,
+                "standby == on"
+            ],
             "pSiteDown": [
                 "lpt > 1000000000",
                 "lss == 1" ,
                 "srr == P" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt == 10",
                 "lss == 1",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score == 100" ,
-               "standby == on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score == 100" ,
+                "standby == on"
+            ]
         }
 }
diff --git a/test/json/angi-ScaleUp/demo_kill_prim_inst.json b/test/json/angi-ScaleUp/demo_kill_prim_inst.json
index 1c81c9f5..74b565fc 100644
--- a/test/json/angi-ScaleUp/demo_kill_prim_inst.json
+++ b/test/json/angi-ScaleUp/demo_kill_prim_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequisites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite == @@pSite@@ or pSite == %pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score! == 123",
-           "pSite": "pSiteUpDemo",
-           "sSite": "sSiteUpDemo",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequisites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite == @@pSite@@ or pSite == %pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score! == 123",
+            "pSite": "pSiteUpDemo",
+            "sSite": "sSiteUpDemo",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,26 +29,26 @@
                 "lpt >~ 1000000000:20" ,
                 "srHook ~ (PRIM|SWAIT|SREG)" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll == SOK"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (90|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (90|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -56,43 +56,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 1" ,
-               "srr == P" ,
-               "lpt >~ 1000000000:(30|20|10)" ,
-               "srHook ~ (PRIM|SWAIT|SREG)" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 1" ,
+                "srr == P" ,
+                "lpt >~ 1000000000:(30|20|10)" ,
+                "srHook ~ (PRIM|SWAIT|SREG)" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll == SOK"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (90|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)" ,
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll == SOK"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (90|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)" ,
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/flap.json b/test/json/angi-ScaleUp/flap.json
index 7afac9be..e2bfeac5 100644
--- a/test/json/angi-ScaleUp/flap.json
+++ b/test/json/angi-ScaleUp/flap.json
@@ -3,35 +3,35 @@
     "name": "flap - test the new test parser",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 4",
-           "pSite": [
-                "lpt >~ 2000000000:^(20|30|1.........)$",
-                "lss == 4",
-                "srr == P",
-                "srHook == PRIM",
-                "srPoll == PRIM",
-                "hugo is None"
-           ],
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-            "step": "final40",
-            "name": "still running",
-            "next": "END",
-            "loop": 1,
-            "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            {
+                "step": "prereq10",
+                "name": "test prerequitsites",
+                "next": "final40",
+                "loop": 1,
+                "wait": 1,
+                "post": "sleep 4",
+                "pSite": [
+                    "lpt >~ 2000000000:^(20|30|1.........)$",
+                    "lss == 4",
+                    "srr == P",
+                    "srHook == PRIM",
+                    "srPoll == PRIM",
+                    "hugo is None"
+                ],
+                "sSite": "sSiteUp",
+                "pHost": "pHostUp", 
+                "sHost": "sHostUp"
+            },
+            {
+                "step": "final40",
+                "name": "still running",
+                "next": "END",
+                "loop": 1,
+                "wait": 1,
+                "pSite": "pSiteUp",
+                "sSite": "sSiteUp",
+                "pHost": "pHostUp", 
+                "sHost": "sHostUp"
+            }
     ]
 }
diff --git a/test/json/angi-ScaleUp/flop.json b/test/json/angi-ScaleUp/flop.json
index 671fbfad..5a5a5442 100644
--- a/test/json/angi-ScaleUp/flop.json
+++ b/test/json/angi-ScaleUp/flop.json
@@ -3,36 +3,36 @@
     "name": "flop - this test should NOT pass successfully",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 4",
-           "pSite": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 4",
+            "pSite": [
                 "lpt >~ 2000000000:^(20|30|1.........)$",
                 "lss == 4",
                 "srr == P",
                 "srHook == PRIM",
                 "srPoll == PRIM"
-           ],
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+            ],
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": [
+            "pSite": [
                 "lpt is None"
-           ],
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            ],
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            " sHost": "sHostUp"
+        } 
     ]
 }
diff --git a/test/json/angi-ScaleUp/flup.json b/test/json/angi-ScaleUp/flup.json
index bfe0eeb0..30fb9374 100644
--- a/test/json/angi-ScaleUp/flup.json
+++ b/test/json/angi-ScaleUp/flup.json
@@ -3,28 +3,28 @@
     "name": "flup - like nop but very short sleep only - only for checking the test engine",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 4",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 4",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/free_log_area.json b/test/json/angi-ScaleUp/free_log_area.json
index 451cfd56..ab2ceb68 100644
--- a/test/json/angi-ScaleUp/free_log_area.json
+++ b/test/json/angi-ScaleUp/free_log_area.json
@@ -1,42 +1,42 @@
 {
     "test": "free_log_area",
-    "name": "free log area on primary",
+    "name": "free hana log area on primary site",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_free_log_area",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "still running",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 60",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 1,
-           "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_free_log_area",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "still running",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 60",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/freeze_prim_fs.json b/test/json/angi-ScaleUp/freeze_prim_fs.json
index 1735a93f..c50565d6 100644
--- a/test/json/angi-ScaleUp/freeze_prim_fs.json
+++ b/test/json/angi-ScaleUp/freeze_prim_fs.json
@@ -3,19 +3,19 @@
     "name": "freeze sap hana fs on primary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_freeze_prim_fs",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_freeze_prim_fs",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -26,23 +26,23 @@
                 "lpt >~ 1000000000:(20|10)" ,
                 "srHook ~ (PRIM|SWAIT|SREG)" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -50,41 +50,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss ~ (1|2)",
-               "srr ~ (P|S)" ,
-               "lpt >~ 1000000000:(30|20|10)" ,
-               "srHook ~ (PRIM|SWAIT|SREG)" ,
-               "srPoll ~ (PRIM|SFAIL)"
-           ],
+                "lss ~ (1|2)",
+                "srr ~ (P|S)" ,
+                "lpt >~ 1000000000:(30|20|10)" ,
+                "srHook ~ (PRIM|SWAIT|SREG)" ,
+                "srPoll ~ (PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)" ,
-               "roles == master1::worker:"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)" ,
+                "roles == master1::worker:"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/kill_prim_indexserver.json b/test/json/angi-ScaleUp/kill_prim_indexserver.json
index 625dea85..9e192ae5 100644
--- a/test/json/angi-ScaleUp/kill_prim_indexserver.json
+++ b/test/json/angi-ScaleUp/kill_prim_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +27,25 @@
                 "lpt >~ 1000000000:20" ,
                 "srHook ~ (PRIM|SWAIT|SREG)" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:(30|10)",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (90|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (90|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -53,43 +53,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 1" ,
-               "srr == P" ,
-               "lpt >~ 1000000000:(30|20|10)" ,
-               "srHook ~ (PRIM|SWAIT|SREG)" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 1" ,
+                "srr == P" ,
+                "lpt >~ 1000000000:(30|20|10)" ,
+                "srHook ~ (PRIM|SWAIT|SREG)" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll == SOK"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (90|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)" ,
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll == SOK"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (90|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)" ,
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/kill_prim_inst.json b/test/json/angi-ScaleUp/kill_prim_inst.json
index 93223555..ee40663b 100644
--- a/test/json/angi-ScaleUp/kill_prim_inst.json
+++ b/test/json/angi-ScaleUp/kill_prim_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequisites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequisites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,26 +29,26 @@
                 "lpt >~ 1000000000:20" ,
                 "srHook ~ (PRIM|SWAIT|SREG)" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt >~ 1000000000:30",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (PRIM|SOK)"
-           ],
-           "pHost": [
-               "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (90|5|0)"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state ~ (PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (90|5|0)"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -56,43 +56,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 1" ,
-               "srr == P" ,
-               "lpt >~ 1000000000:(30|20|10)" ,
-               "srHook ~ (PRIM|SWAIT|SREG)" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 1" ,
+                "srr == P" ,
+                "lpt >~ 1000000000:(30|20|10)" ,
+                "srHook ~ (PRIM|SWAIT|SREG)" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt >~ 1000000000:30",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll == SOK"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (90|5)"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)" ,
-               "srah == T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt >~ 1000000000:30",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll == SOK"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (90|5)"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)" ,
+                "srah == T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/kill_prim_node.json b/test/json/angi-ScaleUp/kill_prim_node.json
index 160f480c..f0802493 100644
--- a/test/json/angi-ScaleUp/kill_prim_node.json
+++ b/test/json/angi-ScaleUp/kill_prim_node.json
@@ -3,19 +3,19 @@
     "name": "Kill primary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -26,26 +26,26 @@
                 "lpt ~ (1[6-9]........|20|10)" ,
                 "srHook ~ (PRIM|SWAIT|SREG)" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt ~ (1[6-9]........|30)",
                 "lss == 4",
                 "srr ~ (S|P)",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll ~ (SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state is None",
-               "roles is None",
-               "score is None"
-           ],
-           "sHost": [
-               "clone_state ~ (PROMOTED|DEMOTED)",
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state is None",
+                "roles is None",
+                "score is None"
+            ],
+            "sHost": [
+                "clone_state ~ (PROMOTED|DEMOTED)",
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -53,41 +53,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss ~ (1|2)",
-               "srr ~ (P|S)" ,
-               "lpt ~ (1[6-9]........|30|20|10)" ,
-               "srHook ~ (PRIM|SWAIT|SREG)" ,
-               "srPoll ~ (PRIM|SFAIL)"
-           ],
+                "lss ~ (1|2)",
+                "srr ~ (P|S)" ,
+                "lpt ~ (1[6-9]........|30|20|10)" ,
+                "srHook ~ (PRIM|SWAIT|SREG)" ,
+                "srPoll ~ (PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt ~ (1[6-9]........|30)",
-               "lss == 4",
-               "srr ~ (S|P)",
-               "srHook == PRIM",
-               "srPoll ~ (SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)" ,
-               "roles == master1::worker:"
-           ],
-           "sHost": [
-               "clone_state ~ (DEMOTED|PROMOTED)" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt ~ (1[6-9]........|30)",
+                "lss == 4",
+                "srr ~ (S|P)",
+                "srHook == PRIM",
+                "srPoll ~ (SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED|WAITING4NODES)" ,
+                "roles == master1::worker:"
+            ],
+            "sHost": [
+                "clone_state ~ (DEMOTED|PROMOTED)" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/kill_secn_indexserver.json b/test/json/angi-ScaleUp/kill_secn_indexserver.json
index d1939c74..f6fbfa3f 100644
--- a/test/json/angi-ScaleUp/kill_secn_indexserver.json
+++ b/test/json/angi-ScaleUp/kill_secn_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt > 1000000000" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt ~ (10|30)",
                 "lss ~ (1|2)",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == DEMOTED" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == DEMOTED" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4" ,
-               "srr == P" ,
-               "lpt > 1000000000" ,
-               "srHook == PRIM" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 4" ,
+                "srr == P" ,
+                "lpt > 1000000000" ,
+                "srHook == PRIM" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss == 1",
-               "srr == S",
-               "srHook == SFAIL",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 240,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sCCC to be the same as at test begin",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss == 1",
+                "srr == S",
+                "srHook == SFAIL",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 240,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sCCC to be the same as at test begin",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/kill_secn_inst.json b/test/json/angi-ScaleUp/kill_secn_inst.json
index a15a8588..66b68f6d 100644
--- a/test/json/angi-ScaleUp/kill_secn_inst.json
+++ b/test/json/angi-ScaleUp/kill_secn_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt > 1000000000" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt ~ (10|30)",
                 "lss ~ (1|2)",
                 "srr == S",
                 "srHook ~ (SFAIL|SWAIT)",
                 "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == DEMOTED" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == DEMOTED" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +54,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4" ,
-               "srr == P" ,
-               "lpt > 1000000000" ,
-               "srHook == PRIM" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 4" ,
+                "srr == P" ,
+                "lpt > 1000000000" ,
+                "srHook == PRIM" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss ~ (1|2)",
-               "srr == S",
-               "srHook ~ (SFAIL|SWAIT)",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 240,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss ~ (1|2)",
+                "srr == S",
+                "srHook ~ (SFAIL|SWAIT)",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 240,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/kill_secn_node.json b/test/json/angi-ScaleUp/kill_secn_node.json
index c8a12b47..18221292 100644
--- a/test/json/angi-ScaleUp/kill_secn_node.json
+++ b/test/json/angi-ScaleUp/kill_secn_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +27,25 @@
                 "lpt > 1000000000" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt == 10",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state is None",
-               "roles is None" ,
-               "score is None"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state is None",
+                "roles is None" ,
+                "score is None"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -53,41 +53,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4" ,
-               "srr == P" ,
-               "lpt > 1000000000" ,
-               "srHook == PRIM" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 4" ,
+                "srr == P" ,
+                "lpt > 1000000000" ,
+                "srHook == PRIM" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss ~ (1|2)",
-               "srr == S",
-               "srHook ~ (SFAIL|SWAIT)",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss ~ (1|2)",
+                "srr == S",
+                "srHook ~ (SFAIL|SWAIT)",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/maintenance_cluster_turn_hana.json b/test/json/angi-ScaleUp/maintenance_cluster_turn_hana.json
index 54e79d46..2c821542 100644
--- a/test/json/angi-ScaleUp/maintenance_cluster_turn_hana.json
+++ b/test/json/angi-ScaleUp/maintenance_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "maintenance_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_maintenance_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_maintenance_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/maintenance_with_standby_nodes.json b/test/json/angi-ScaleUp/maintenance_with_standby_nodes.json
index fb2abb34..6b064b31 100644
--- a/test/json/angi-ScaleUp/maintenance_with_standby_nodes.json
+++ b/test/json/angi-ScaleUp/maintenance_with_standby_nodes.json
@@ -2,22 +2,20 @@
     "test": "maintenance_with_standby_nodes",
     "name": "standby+online secondary then standby+online primary",
     "start": "prereq10",
-    "sid": "HA1",
-    "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites ssn",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites ssn",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "secondary site: node is standby",
             "next": "step30",
@@ -26,10 +24,10 @@
             "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
-           "pHost": "pHostUp",
-           "sHost": "sHostDown"
-       },
-       {
+            "pHost": "pHostUp",
+            "sHost": "sHostDown"
+        },
+        {
             "step": "step30",
             "name": "secondary site: node back online",
             "next": "step40",
@@ -38,43 +36,43 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt == 10",
-               "lss == 1",
-               "srr == S",
-               "srHook == SWAIT",
-               "srPoll == SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state == DEMOTED" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "step40",
-           "name": "sr up and running again",
-           "next": "step110",
+                "lpt == 10",
+                "lss == 1",
+                "srr == S",
+                "srHook == SWAIT",
+                "srPoll == SFAIL"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state == DEMOTED" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "step40",
+            "name": "sr up and running again",
+            "next": "step110",
             "loop": 120,
             "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step110",
-           "name": "test prerequitsites spn",
-           "next": "step120",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step110",
+            "name": "test prerequitsites spn",
+            "next": "step120",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step120",
             "name": "primary site: node is standby",
             "next": "step130",
@@ -87,15 +85,15 @@
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll == SOK"
-           ],
-           "pHost": "pHostDown",
-           "sHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostDown",
+            "sHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step130",
             "name": "takeover on secondary",
             "next": "final140",
@@ -103,33 +101,33 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss == 1" ,
-               "srr == P" ,
-               "lpt == 10" ,
-               "srHook == SWAIT" ,
-               "srPoll == SFAIL"
+                "lss == 1" ,
+                "srr == P" ,
+                "lpt == 10" ,
+                "srHook ~ (SWAIT|SFAIL)" ,
+                "srPoll == SFAIL"
             ],
             "sSite": "pSiteUp",
             "pHost": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score == 150" ,
-               "standby == on"
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score == 150" ,
+                "standby == on"
             ],
             "sHost": "pHostUp"
-       },
-       {
-           "step": "final140",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        },
+        {
+            "step": "final140",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/nop.json b/test/json/angi-ScaleUp/nop.json
index 872854df..6403c51e 100644
--- a/test/json/angi-ScaleUp/nop.json
+++ b/test/json/angi-ScaleUp/nop.json
@@ -3,28 +3,28 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/restart_cluster.json b/test/json/angi-ScaleUp/restart_cluster.json
index 6434fe0c..43885d60 100644
--- a/test/json/angi-ScaleUp/restart_cluster.json
+++ b/test/json/angi-ScaleUp/restart_cluster.json
@@ -1,31 +1,31 @@
 {
     "test": "restart_cluster",
-    "name": "restart_cluster",
+    "name": "stop and restart cluster and hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_restart_cluster",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_restart_cluster",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/restart_cluster_hana_running.json b/test/json/angi-ScaleUp/restart_cluster_hana_running.json
index 85dd0e3f..bd543890 100644
--- a/test/json/angi-ScaleUp/restart_cluster_hana_running.json
+++ b/test/json/angi-ScaleUp/restart_cluster_hana_running.json
@@ -1,31 +1,31 @@
 {
     "test": "restart_cluster_hana_running",
-    "name": "restart_cluster_hana_running",
+    "name": "stop and restart cluster, keep hana_running",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_restart_cluster_hana_running",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_restart_cluster_hana_running",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/restart_cluster_turn_hana.json b/test/json/angi-ScaleUp/restart_cluster_turn_hana.json
index 4ae5c4f1..cf719a26 100644
--- a/test/json/angi-ScaleUp/restart_cluster_turn_hana.json
+++ b/test/json/angi-ScaleUp/restart_cluster_turn_hana.json
@@ -1,32 +1,32 @@
 {
     "test": "restart_cluster_turn_hana",
-    "name": "restart_cluster_turn_hana",
+    "name": "stop cluster, turn hana, start cluster",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell sct_test_restart_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell sct_test_restart_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/split_brain_prio.json b/test/json/angi-ScaleUp/split_brain_prio.json
index 0dbc112a..3e9a675d 100644
--- a/test/json/angi-ScaleUp/split_brain_prio.json
+++ b/test/json/angi-ScaleUp/split_brain_prio.json
@@ -3,19 +3,19 @@
     "name": "split brain with prio fencing to simulate fence of secondary",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "simulate_split_brain",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "simulate_split_brain",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,20 +27,20 @@
                 "lpt > 1000000000" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt == 10",
                 "srr == S",
                 "srHook == SFAIL",
                 "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -48,41 +48,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss == 4" ,
-               "srr == P" ,
-               "lpt > 1000000000" ,
-               "srHook == PRIM" ,
-               "srPoll == PRIM"
-           ],
+                "lss == 4" ,
+                "srr == P" ,
+                "lpt > 1000000000" ,
+                "srHook == PRIM" ,
+                "srPoll == PRIM"
+            ],
             "sSite": [
-               "lpt == 10",
-               "lss ~ (1|2)",
-               "srr == S",
-               "srHook ~ (SFAIL|SWAIT)",
-               "srPoll ~ (SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state ~ (UNDEFINED|DEMOTED)" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt == 10",
+                "lss ~ (1|2)",
+                "srr == S",
+                "srHook ~ (SFAIL|SWAIT)",
+                "srPoll ~ (SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state ~ (UNDEFINED|DEMOTED)" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/standby_prim_node.json b/test/json/angi-ScaleUp/standby_prim_node.json
index 95730b4c..a21f8ad6 100644
--- a/test/json/angi-ScaleUp/standby_prim_node.json
+++ b/test/json/angi-ScaleUp/standby_prim_node.json
@@ -3,19 +3,19 @@
     "name": "standby primary node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -27,27 +27,27 @@
                 "lpt > 1000000000" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt ~ (30|1[6-9]........)",
                 "lss == 4",
                 "srr == S",
                 "srHook ~ (PRIM|SOK)",
                 "srPoll == SOK"
-           ],
-           "pHost": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score == 150" ,
-               "standby == on"
-           ],
-           "sHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score ~ (100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score == 150" ,
+                "standby == on"
+            ],
+            "sHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score ~ (100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "takeover on secondary",
             "next": "final40",
@@ -55,43 +55,43 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss == 1" ,
-               "srr == P" ,
-               "lpt == 10" ,
-               "srHook == SWAIT" ,
-               "srPoll == SFAIL"
-           ],
+                "lss == 1" ,
+                "srr == P" ,
+                "lpt == 10" ,
+                "srHook == SWAIT" ,
+                "srPoll == SFAIL"
+            ],
             "sSite": [
-               "lpt > 1000000000",
-               "lss == 4",
-               "srr == P",
-               "srHook == PRIM",
-               "srPoll == PRIM"
-           ],
-           "pHost": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score == 150" ,
-               "standby == on"
-           ],
-           "sHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "todo": "allow pointer to prereq10",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt > 1000000000",
+                "lss == 4",
+                "srr == P",
+                "srHook == PRIM",
+                "srPoll == PRIM"
+            ],
+            "pHost": [
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score == 150" ,
+                "standby == on"
+            ],
+            "sHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "todo": "allow pointer to prereq10",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/angi-ScaleUp/standby_secn_node.json b/test/json/angi-ScaleUp/standby_secn_node.json
index 71dbb1da..514de4ad 100644
--- a/test/json/angi-ScaleUp/standby_secn_node.json
+++ b/test/json/angi-ScaleUp/standby_secn_node.json
@@ -2,97 +2,95 @@
     "test": "standby_secondary_node",
     "name": "standby secondary node (and online again)",
     "start": "prereq10",
-    "sid": "HA1",
-    "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-            "step": "step20",
-            "name": "node is standby",
-            "next": "step30",
-            "loop": 120,
-            "wait": 2,
-            "post": "osn",
-            "pSite": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+             "step": "step20",
+             "name": "node is standby",
+             "next": "step30",
+             "loop": 120,
+             "wait": 2,
+             "post": "osn",
+             "pSite": [
+                 "lss == 4" ,
+                 "srr == P" ,
+                 "lpt > 1000000000" ,
+                 "srHook == PRIM" ,
+                 "srPoll == PRIM"
+             ],
+             "sSite": [
+                 "lpt == 10",
+                 "lss == 1",
+                 "srr == S",
+                 "srHook == SFAIL",
+                 "srPoll == SFAIL"
+             ],
+             "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == UNDEFINED" ,
+                "roles == master1::worker:" ,
+                "score == 100" ,
+                "standby == on"
+            ]
+        },
+        {
+             "step": "step30",
+             "name": "node back online",
+             "next": "final40",
+             "loop": 120,
+             "wait": 2,
+             "todo": "pHost+sHost to check site-name",
+             "pSite": [
                 "lss == 4" ,
                 "srr == P" ,
                 "lpt > 1000000000" ,
                 "srHook == PRIM" ,
                 "srPoll == PRIM"
-           ],
-            "sSite": [
+             ],
+             "sSite": [
                 "lpt == 10",
                 "lss == 1",
                 "srr == S",
-                "srHook == SFAIL",
+                "srHook == SWAIT",
                 "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == UNDEFINED" ,
-               "roles == master1::worker:" ,
-               "score == 100" ,
-               "standby == on"
-           ]
-       },
-       {
-            "step": "step30",
-            "name": "node back online",
-            "next": "final40",
+            ],
+            "pHost": [
+                "clone_state == PROMOTED" ,
+                "roles == master1:master:worker:master" ,
+                "score == 150"
+            ],
+            "sHost": [
+                "clone_state == DEMOTED" ,
+                "roles == master1::worker:" ,
+                "score ~ (-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
             "loop": 120,
             "wait": 2,
-            "todo": "pHost+sHost to check site-name",
-            "pSite": [
-               "lss == 4" ,
-               "srr == P" ,
-               "lpt > 1000000000" ,
-               "srHook == PRIM" ,
-               "srPoll == PRIM"
-           ],
-            "sSite": [
-               "lpt == 10",
-               "lss == 1",
-               "srr == S",
-               "srHook == SWAIT",
-               "srPoll == SFAIL"
-           ],
-           "pHost": [
-               "clone_state == PROMOTED" ,
-               "roles == master1:master:worker:master" ,
-               "score == 150"
-           ],
-           "sHost": [
-               "clone_state == DEMOTED" ,
-               "roles == master1::worker:" ,
-               "score ~ (-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/block_manual_takeover.json b/test/json/classic-ScaleOut-BW/block_manual_takeover.json
index 4a66bcff..41863d25 100644
--- a/test/json/classic-ScaleOut-BW/block_manual_takeover.json
+++ b/test/json/classic-ScaleOut-BW/block_manual_takeover.json
@@ -3,40 +3,40 @@
     "name": "blocked manual takeover",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "bmt",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "bmt",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/defaults+newComparators.json b/test/json/classic-ScaleOut-BW/defaults+newComparators.json
index 44699c70..1287f744 100644
--- a/test/json/classic-ScaleOut-BW/defaults+newComparators.json
+++ b/test/json/classic-ScaleOut-BW/defaults+newComparators.json
@@ -1,66 +1,66 @@
 {
     "checkPtr": {
-           "comparartorinline": [
+            "comparartorinline": [
                 "alfa!=dassollungleichsein",
                 "lpa_@@sid@@_lpt > 160000",
                 "beta=dassollgleichsein"
-           ],
-           "comparatortuple": [
-               ("noty", "alfa=ungleich"),
-               ()
-           ],
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
+            ],
+            "comparatortuple": [
+                ("noty", "alfa=ungleich"),
+                ()
+            ],
+            "globalUp": [
+                "topology=ScaleOut"
+            ],
+            "pHostUp": [
+                "clone_state=PROMOTED",
+                "roles=master1:master:worker:master",
+                "score=150"
+            ],
+            "pSiteUp": [
                 "lpt=1[6-9]........",
                 "lss=4",
                 "srr=P",
                 "srHook=PRIM",
                 "srPoll=PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt=30",
                 "lss=4",
-               "srr=S",
+                "srr=S",
                 "srHook=SOK",
                 "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles=master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state=DEMOTED",
+                "roles=master1:master:worker:master",
+                "score=100"
+            ],
+            "pHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
             "pSiteDown": [
                 "lpt=1[6-9]........" ,
                 "lss=1" ,
                 "srr=P" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
         }
 }
diff --git a/test/json/classic-ScaleOut-BW/defaults.json b/test/json/classic-ScaleOut-BW/defaults.json
index aabce016..fb1840a6 100644
--- a/test/json/classic-ScaleOut-BW/defaults.json
+++ b/test/json/classic-ScaleOut-BW/defaults.json
@@ -2,58 +2,58 @@
     "opMode": "logreplay",
     "srMode": "sync",
     "checkPtr": {
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
+            "globalUp": [
+                "topology=ScaleOut"
+            ],
+            "pHostUp": [
+                "clone_state=PROMOTED",
+                "roles=master1:master:worker:master",
+                "score=150"
+            ],
+            "pSiteUp": [
                 "lpt=1[6-9]........",
                 "lss=4",
                 "srr=P",
                 "srHook=PRIM",
                 "srPoll=PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt=30",
                 "lss=4",
-               "srr=S",
+                "srr=S",
                 "srHook=SOK",
                 "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles=master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state=DEMOTED",
+                "roles=master1:master:worker:master",
+                "score=100"
+            ],
+            "pHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
             "pSiteDown": [
                 "lpt=1[6-9]........" ,
                 "lss=1" ,
                 "srr=P" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
         }
 }
diff --git a/test/json/classic-ScaleOut-BW/free_log_area.json b/test/json/classic-ScaleOut-BW/free_log_area.json
index 3de2d553..f1708d42 100644
--- a/test/json/classic-ScaleOut-BW/free_log_area.json
+++ b/test/json/classic-ScaleOut-BW/free_log_area.json
@@ -3,40 +3,40 @@
     "name": "free log area on primary",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_free_log_area",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "still running",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 60",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 1,
-           "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_free_log_area",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "still running",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 60",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_prim_indexserver.json b/test/json/classic-ScaleOut-BW/kill_prim_indexserver.json
index ebe08863..47e0ed1a 100644
--- a/test/json/classic-ScaleOut-BW/kill_prim_indexserver.json
+++ b/test/json/classic-ScaleOut-BW/kill_prim_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,26 +28,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -55,43 +55,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_prim_inst.json b/test/json/classic-ScaleOut-BW/kill_prim_inst.json
index cd31c9d7..78260e10 100644
--- a/test/json/classic-ScaleOut-BW/kill_prim_inst.json
+++ b/test/json/classic-ScaleOut-BW/kill_prim_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -30,26 +30,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -57,43 +57,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_prim_node.json b/test/json/classic-ScaleOut-BW/kill_prim_node.json
index 5df8781f..cad372b6 100644
--- a/test/json/classic-ScaleOut-BW/kill_prim_node.json
+++ b/test/json/classic-ScaleOut-BW/kill_prim_node.json
@@ -3,19 +3,19 @@
     "name": "Kill primary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,23 +27,23 @@
                 "lpt=(1[6-9]........|20|10)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=(S|P)",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -51,41 +51,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=(1|2)",
-               "srr=(P|S)" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=(PRIM|SFAIL)"
-           ],
+                "lss=(1|2)",
+                "srr=(P|S)" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=(PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
-               "roles=master1::worker:"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
+                "roles=master1::worker:"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_prim_worker_indexserver.json b/test/json/classic-ScaleOut-BW/kill_prim_worker_indexserver.json
index dbc8b46c..dc6caba4 100644
--- a/test/json/classic-ScaleOut-BW/kill_prim_worker_indexserver.json
+++ b/test/json/classic-ScaleOut-BW/kill_prim_worker_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary worker indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +27,25 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "todo": "pHost+sHost to check site-name",
             "todo2": "why do we need SFAIL for srHook?",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=(PRIM|SFAIL)",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=(PRIM|SFAIL)",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_prim_worker_inst.json b/test/json/classic-ScaleOut-BW/kill_prim_worker_inst.json
index da4900be..36c1232d 100644
--- a/test/json/classic-ScaleOut-BW/kill_prim_worker_inst.json
+++ b/test/json/classic-ScaleOut-BW/kill_prim_worker_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,25 +29,25 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -55,43 +55,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:",
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:",
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_prim_worker_node.json b/test/json/classic-ScaleOut-BW/kill_prim_worker_node.json
index 01250295..663372a7 100644
--- a/test/json/classic-ScaleOut-BW/kill_prim_worker_node.json
+++ b/test/json/classic-ScaleOut-BW/kill_prim_worker_node.json
@@ -3,19 +3,19 @@
     "name": "Kill primary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +27,25 @@
                 "lpt=(1[6-9]........|20|10)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=(S|P)",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(DEMOTED|UNDEFINED|WAITING4NODES)" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(DEMOTED|UNDEFINED|WAITING4NODES)" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -53,41 +53,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=(1|2)",
-               "srr=(P|S)" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=(PRIM|SFAIL)"
-           ],
+                "lss=(1|2)",
+                "srr=(P|S)" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=(PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
-               "roles=master1::worker:"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
+                "roles=master1::worker:"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_secn_indexserver.json b/test/json/classic-ScaleOut-BW/kill_secn_indexserver.json
index 9d14c833..4f500059 100644
--- a/test/json/classic-ScaleOut-BW/kill_secn_indexserver.json
+++ b/test/json/classic-ScaleOut-BW/kill_secn_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SFAIL",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sCCC to be the same as at test begin",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SFAIL",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sCCC to be the same as at test begin",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_secn_inst.json b/test/json/classic-ScaleOut-BW/kill_secn_inst.json
index d6e67b09..2db5e9b2 100644
--- a/test/json/classic-ScaleOut-BW/kill_secn_inst.json
+++ b/test/json/classic-ScaleOut-BW/kill_secn_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +54,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 240,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 240,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_secn_node.json b/test/json/classic-ScaleOut-BW/kill_secn_node.json
index 3df7a74c..a5febca2 100644
--- a/test/json/classic-ScaleOut-BW/kill_secn_node.json
+++ b/test/json/classic-ScaleOut-BW/kill_secn_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,21 +27,21 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -49,41 +49,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_secn_worker_inst.json b/test/json/classic-ScaleOut-BW/kill_secn_worker_inst.json
index 2af4b7ea..6a00bf97 100644
--- a/test/json/classic-ScaleOut-BW/kill_secn_worker_inst.json
+++ b/test/json/classic-ScaleOut-BW/kill_secn_worker_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,15 +28,15 @@
                 "srr=S",
                 "srHook=(SFAIL|SWAIT)",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -45,30 +45,30 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/kill_secn_worker_node.json b/test/json/classic-ScaleOut-BW/kill_secn_worker_node.json
index cc955eac..ddbaad16 100644
--- a/test/json/classic-ScaleOut-BW/kill_secn_worker_node.json
+++ b/test/json/classic-ScaleOut-BW/kill_secn_worker_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,13 +28,13 @@
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=WAITING4NODES" 
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=WAITING4NODES" 
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -43,30 +43,30 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/maintenance_cluster_turn_hana.json b/test/json/classic-ScaleOut-BW/maintenance_cluster_turn_hana.json
index 15aacfa3..cdf90e80 100644
--- a/test/json/classic-ScaleOut-BW/maintenance_cluster_turn_hana.json
+++ b/test/json/classic-ScaleOut-BW/maintenance_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "maintenance_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_maintenance_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_maintenance_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/maintenance_with_standby_nodes.json b/test/json/classic-ScaleOut-BW/maintenance_with_standby_nodes.json
index 93ec9f13..feba872b 100644
--- a/test/json/classic-ScaleOut-BW/maintenance_with_standby_nodes.json
+++ b/test/json/classic-ScaleOut-BW/maintenance_with_standby_nodes.json
@@ -6,19 +6,19 @@
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "todo": "expectations needs to be fixed - e.g. step20 sHostDown is wrong, because topology will also be stopped. roles will be ::: not master1:...",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites ssn",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites ssn",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "secondary site: node is standby",
             "next": "step30",
@@ -27,10 +27,10 @@
             "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
-           "pHost": "pHostUp",
-           "sHost": "sHostDown"
-       },
-       {
+            "pHost": "pHostUp",
+            "sHost": "sHostDown"
+        },
+        {
             "step": "step30",
             "name": "secondary site: node back online",
             "next": "step40",
@@ -39,43 +39,43 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "step40",
-           "name": "end recover",
-           "next": "step110",
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "step40",
+            "name": "end recover",
+            "next": "step110",
             "loop": 120,
             "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step110",
-           "name": "test prerequitsites spn",
-           "next": "step120",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step110",
+            "name": "test prerequitsites spn",
+            "next": "step120",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step120",
             "name": "primary site: node is standby",
             "next": "step130",
@@ -88,15 +88,15 @@
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": "pHostDown",
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostDown",
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step130",
             "name": "takeover on secondary",
             "next": "final140",
@@ -104,33 +104,33 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
             ],
             "sSite": "pSiteUp",
             "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
             ],
             "sHost": "pHostUp"
-       },
-       {
-           "step": "final140",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        },
+        {
+            "step": "final140",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/nop-false.json b/test/json/classic-ScaleOut-BW/nop-false.json
index a3c5ad48..46924104 100644
--- a/test/json/classic-ScaleOut-BW/nop-false.json
+++ b/test/json/classic-ScaleOut-BW/nop-false.json
@@ -3,31 +3,31 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": [
-               "topology=Nix"
-           ],
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": [
+                "topology=Nix"
+            ],
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/nop.json b/test/json/classic-ScaleOut-BW/nop.json
index e3d9826e..31d4111e 100644
--- a/test/json/classic-ScaleOut-BW/nop.json
+++ b/test/json/classic-ScaleOut-BW/nop.json
@@ -3,29 +3,29 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": "globalUp",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": "globalUp",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/restart_cluster.json b/test/json/classic-ScaleOut-BW/restart_cluster.json
index 7018fdd2..c59f8e20 100644
--- a/test/json/classic-ScaleOut-BW/restart_cluster.json
+++ b/test/json/classic-ScaleOut-BW/restart_cluster.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/restart_cluster_hana_running.json b/test/json/classic-ScaleOut-BW/restart_cluster_hana_running.json
index b7a20ca7..25ebf149 100644
--- a/test/json/classic-ScaleOut-BW/restart_cluster_hana_running.json
+++ b/test/json/classic-ScaleOut-BW/restart_cluster_hana_running.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster_hana_running",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_hana_running",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_hana_running",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/restart_cluster_turn_hana.json b/test/json/classic-ScaleOut-BW/restart_cluster_turn_hana.json
index cd398f38..fc1a482a 100644
--- a/test/json/classic-ScaleOut-BW/restart_cluster_turn_hana.json
+++ b/test/json/classic-ScaleOut-BW/restart_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "restart_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/standby_prim_node.json b/test/json/classic-ScaleOut-BW/standby_prim_node.json
index 765654ad..1e047088 100644
--- a/test/json/classic-ScaleOut-BW/standby_prim_node.json
+++ b/test/json/classic-ScaleOut-BW/standby_prim_node.json
@@ -3,19 +3,19 @@
     "name": "standby primary node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -27,27 +27,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(30|1[6-9]........)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "takeover on secondary",
             "next": "final40",
@@ -55,43 +55,43 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
+            ],
             "sSite": [
-               "lpt=1[6-9]........",
-               "lss=4",
-               "srr=P",
-               "srHook=PRIM",
-               "srPoll=PRIM"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "todo": "allow pointer to prereq10",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=1[6-9]........",
+                "lss=4",
+                "srr=P",
+                "srHook=PRIM",
+                "srPoll=PRIM"
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "todo": "allow pointer to prereq10",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut-BW/standby_secn_node.json b/test/json/classic-ScaleOut-BW/standby_secn_node.json
index 686e3063..ae59404c 100644
--- a/test/json/classic-ScaleOut-BW/standby_secn_node.json
+++ b/test/json/classic-ScaleOut-BW/standby_secn_node.json
@@ -5,19 +5,19 @@
     "sid": "HA1",
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -30,27 +30,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
+        },
+        {
             "step": "step30",
             "name": "node back online",
             "next": "final40",
@@ -58,41 +58,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/block_manual_takeover.json b/test/json/classic-ScaleOut/block_manual_takeover.json
index 4a66bcff..41863d25 100644
--- a/test/json/classic-ScaleOut/block_manual_takeover.json
+++ b/test/json/classic-ScaleOut/block_manual_takeover.json
@@ -3,40 +3,40 @@
     "name": "blocked manual takeover",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "bmt",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "bmt",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/defaults+newComparators.json b/test/json/classic-ScaleOut/defaults+newComparators.json
deleted file mode 100644
index 44699c70..00000000
--- a/test/json/classic-ScaleOut/defaults+newComparators.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "checkPtr": {
-           "comparartorinline": [
-                "alfa!=dassollungleichsein",
-                "lpa_@@sid@@_lpt > 160000",
-                "beta=dassollgleichsein"
-           ],
-           "comparatortuple": [
-               ("noty", "alfa=ungleich"),
-               ()
-           ],
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
-                "lpt=1[6-9]........",
-                "lss=4",
-                "srr=P",
-                "srHook=PRIM",
-                "srPoll=PRIM"
-           ],
-           "sSiteUp": [
-                "lpt=30",
-                "lss=4",
-               "srr=S",
-                "srHook=SOK",
-                "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles=master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-            "pSiteDown": [
-                "lpt=1[6-9]........" ,
-                "lss=1" ,
-                "srr=P" ,
-                "srHook=PRIM" ,
-                "srPoll=PRIM"
-           ],
-           "sSiteDown": [
-                "lpt=10",
-                "lss=1",
-                "srr=S",
-                "srHook=SFAIL",
-                "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
-        }
-}
diff --git a/test/json/classic-ScaleOut/defaults.json b/test/json/classic-ScaleOut/defaults.json
index aabce016..fb1840a6 100644
--- a/test/json/classic-ScaleOut/defaults.json
+++ b/test/json/classic-ScaleOut/defaults.json
@@ -2,58 +2,58 @@
     "opMode": "logreplay",
     "srMode": "sync",
     "checkPtr": {
-           "globalUp": [
-               "topology=ScaleOut"
-           ],
-           "pHostUp": [
-               "clone_state=PROMOTED",
-               "roles=master1:master:worker:master",
-               "score=150"
-           ],
-           "pSiteUp": [
+            "globalUp": [
+                "topology=ScaleOut"
+            ],
+            "pHostUp": [
+                "clone_state=PROMOTED",
+                "roles=master1:master:worker:master",
+                "score=150"
+            ],
+            "pSiteUp": [
                 "lpt=1[6-9]........",
                 "lss=4",
                 "srr=P",
                 "srHook=PRIM",
                 "srPoll=PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "lpt=30",
                 "lss=4",
-               "srr=S",
+                "srr=S",
                 "srHook=SOK",
                 "srPoll=SOK"
-           ],
-           "sHostUp": [
-               "clone_state=DEMOTED",
-               "roles=master1:master:worker:master",
-               "score=100"
-           ],
-           "pHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
+            ],
+            "sHostUp": [
+                "clone_state=DEMOTED",
+                "roles=master1:master:worker:master",
+                "score=100"
+            ],
+            "pHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
             "pSiteDown": [
                 "lpt=1[6-9]........" ,
                 "lss=1" ,
                 "srr=P" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "sHostDown": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
+            ],
+            "sHostDown": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
         }
 }
diff --git a/test/json/classic-ScaleOut/free_log_area.json b/test/json/classic-ScaleOut/free_log_area.json
index 3de2d553..f1708d42 100644
--- a/test/json/classic-ScaleOut/free_log_area.json
+++ b/test/json/classic-ScaleOut/free_log_area.json
@@ -3,40 +3,40 @@
     "name": "free log area on primary",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_free_log_area",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "still running",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 60",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 1,
-           "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_free_log_area",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "still running",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 60",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_prim_indexserver.json b/test/json/classic-ScaleOut/kill_prim_indexserver.json
index ebe08863..47e0ed1a 100644
--- a/test/json/classic-ScaleOut/kill_prim_indexserver.json
+++ b/test/json/classic-ScaleOut/kill_prim_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,26 +28,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -55,43 +55,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_prim_inst.json b/test/json/classic-ScaleOut/kill_prim_inst.json
index cd31c9d7..78260e10 100644
--- a/test/json/classic-ScaleOut/kill_prim_inst.json
+++ b/test/json/classic-ScaleOut/kill_prim_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -30,26 +30,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -57,43 +57,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_prim_node.json b/test/json/classic-ScaleOut/kill_prim_node.json
index 5df8781f..cad372b6 100644
--- a/test/json/classic-ScaleOut/kill_prim_node.json
+++ b/test/json/classic-ScaleOut/kill_prim_node.json
@@ -3,19 +3,19 @@
     "name": "Kill primary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,23 +27,23 @@
                 "lpt=(1[6-9]........|20|10)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=(S|P)",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -51,41 +51,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=(1|2)",
-               "srr=(P|S)" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=(PRIM|SFAIL)"
-           ],
+                "lss=(1|2)",
+                "srr=(P|S)" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=(PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
-               "roles=master1::worker:"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
+                "roles=master1::worker:"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_prim_worker_indexserver.json b/test/json/classic-ScaleOut/kill_prim_worker_indexserver.json
index dbc8b46c..dc6caba4 100644
--- a/test/json/classic-ScaleOut/kill_prim_worker_indexserver.json
+++ b/test/json/classic-ScaleOut/kill_prim_worker_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary worker indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +27,25 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "todo": "pHost+sHost to check site-name",
             "todo2": "why do we need SFAIL for srHook?",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=(PRIM|SFAIL)",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 360,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=(PRIM|SFAIL)",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 360,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_prim_worker_inst.json b/test/json/classic-ScaleOut/kill_prim_worker_inst.json
index da4900be..36c1232d 100644
--- a/test/json/classic-ScaleOut/kill_prim_worker_inst.json
+++ b/test/json/classic-ScaleOut/kill_prim_worker_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,25 +29,25 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "score=(90|70|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "score=(90|70|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -55,43 +55,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:",
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|SFAIL)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:",
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_prim_worker_node.json b/test/json/classic-ScaleOut/kill_prim_worker_node.json
index 01250295..663372a7 100644
--- a/test/json/classic-ScaleOut/kill_prim_worker_node.json
+++ b/test/json/classic-ScaleOut/kill_prim_worker_node.json
@@ -3,19 +3,19 @@
     "name": "Kill primary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,25 +27,25 @@
                 "lpt=(1[6-9]........|20|10)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=(S|P)",
                 "srHook=(PRIM|SOK)",
                 "srPoll=(SOK|SFAIL)"
-           ],
-           "pHost": [
-               "clone_state=(DEMOTED|UNDEFINED|WAITING4NODES)" ,
-               "score=(90|70|5)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)",
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(DEMOTED|UNDEFINED|WAITING4NODES)" ,
+                "score=(90|70|5)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)",
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -53,41 +53,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=(1|2)",
-               "srr=(P|S)" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=(PRIM|SFAIL)"
-           ],
+                "lss=(1|2)",
+                "srr=(P|S)" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=(PRIM|SFAIL)"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=(SOK|PRIM)"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
-               "roles=master1::worker:"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145|150)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 300,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=(SOK|PRIM)"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED|WAITING4NODES)" ,
+                "roles=master1::worker:"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145|150)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 300,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_secn_indexserver.json b/test/json/classic-ScaleOut/kill_secn_indexserver.json
index 9d14c833..4f500059 100644
--- a/test/json/classic-ScaleOut/kill_secn_indexserver.json
+++ b/test/json/classic-ScaleOut/kill_secn_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SFAIL",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sCCC to be the same as at test begin",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SFAIL",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sCCC to be the same as at test begin",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_secn_inst.json b/test/json/classic-ScaleOut/kill_secn_inst.json
index d6e67b09..2db5e9b2 100644
--- a/test/json/classic-ScaleOut/kill_secn_inst.json
+++ b/test/json/classic-ScaleOut/kill_secn_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +54,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 240,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 240,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_secn_node.json b/test/json/classic-ScaleOut/kill_secn_node.json
index 3df7a74c..a5febca2 100644
--- a/test/json/classic-ScaleOut/kill_secn_node.json
+++ b/test/json/classic-ScaleOut/kill_secn_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary master node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,21 +27,21 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -49,41 +49,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_secn_worker_inst.json b/test/json/classic-ScaleOut/kill_secn_worker_inst.json
index 2af4b7ea..6a00bf97 100644
--- a/test/json/classic-ScaleOut/kill_secn_worker_inst.json
+++ b/test/json/classic-ScaleOut/kill_secn_worker_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary worker instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,15 +28,15 @@
                 "srr=S",
                 "srHook=(SFAIL|SWAIT)",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -45,30 +45,30 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/kill_secn_worker_node.json b/test/json/classic-ScaleOut/kill_secn_worker_node.json
index cc955eac..ddbaad16 100644
--- a/test/json/classic-ScaleOut/kill_secn_worker_node.json
+++ b/test/json/classic-ScaleOut/kill_secn_worker_node.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary worker node",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_worker_node",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_worker_node",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -28,13 +28,13 @@
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=WAITING4NODES" 
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=WAITING4NODES" 
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -43,30 +43,30 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/maintenance_cluster_turn_hana.json b/test/json/classic-ScaleOut/maintenance_cluster_turn_hana.json
index 15aacfa3..cdf90e80 100644
--- a/test/json/classic-ScaleOut/maintenance_cluster_turn_hana.json
+++ b/test/json/classic-ScaleOut/maintenance_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "maintenance_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_maintenance_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_maintenance_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/maintenance_with_standby_nodes.json b/test/json/classic-ScaleOut/maintenance_with_standby_nodes.json
index 93ec9f13..feba872b 100644
--- a/test/json/classic-ScaleOut/maintenance_with_standby_nodes.json
+++ b/test/json/classic-ScaleOut/maintenance_with_standby_nodes.json
@@ -6,19 +6,19 @@
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "todo": "expectations needs to be fixed - e.g. step20 sHostDown is wrong, because topology will also be stopped. roles will be ::: not master1:...",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites ssn",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites ssn",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "secondary site: node is standby",
             "next": "step30",
@@ -27,10 +27,10 @@
             "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
-           "pHost": "pHostUp",
-           "sHost": "sHostDown"
-       },
-       {
+            "pHost": "pHostUp",
+            "sHost": "sHostDown"
+        },
+        {
             "step": "step30",
             "name": "secondary site: node back online",
             "next": "step40",
@@ -39,43 +39,43 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "step40",
-           "name": "end recover",
-           "next": "step110",
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "step40",
+            "name": "end recover",
+            "next": "step110",
             "loop": 120,
             "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step110",
-           "name": "test prerequitsites spn",
-           "next": "step120",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step110",
+            "name": "test prerequitsites spn",
+            "next": "step120",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step120",
             "name": "primary site: node is standby",
             "next": "step130",
@@ -88,15 +88,15 @@
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": "pHostDown",
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostDown",
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step130",
             "name": "takeover on secondary",
             "next": "final140",
@@ -104,33 +104,33 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
             ],
             "sSite": "pSiteUp",
             "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
             ],
             "sHost": "pHostUp"
-       },
-       {
-           "step": "final140",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        },
+        {
+            "step": "final140",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/nop-false.json b/test/json/classic-ScaleOut/nop-false.json
index a3c5ad48..46924104 100644
--- a/test/json/classic-ScaleOut/nop-false.json
+++ b/test/json/classic-ScaleOut/nop-false.json
@@ -3,31 +3,31 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": [
-               "topology=Nix"
-           ],
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": [
+                "topology=Nix"
+            ],
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/nop.json b/test/json/classic-ScaleOut/nop.json
index e3d9826e..31d4111e 100644
--- a/test/json/classic-ScaleOut/nop.json
+++ b/test/json/classic-ScaleOut/nop.json
@@ -3,29 +3,29 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "global": "globalUp",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "global": "globalUp",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/restart_cluster.json b/test/json/classic-ScaleOut/restart_cluster.json
index 7018fdd2..c59f8e20 100644
--- a/test/json/classic-ScaleOut/restart_cluster.json
+++ b/test/json/classic-ScaleOut/restart_cluster.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/restart_cluster_hana_running.json b/test/json/classic-ScaleOut/restart_cluster_hana_running.json
index b7a20ca7..25ebf149 100644
--- a/test/json/classic-ScaleOut/restart_cluster_hana_running.json
+++ b/test/json/classic-ScaleOut/restart_cluster_hana_running.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster_hana_running",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_hana_running",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_hana_running",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/restart_cluster_turn_hana.json b/test/json/classic-ScaleOut/restart_cluster_turn_hana.json
index cd398f38..fc1a482a 100644
--- a/test/json/classic-ScaleOut/restart_cluster_turn_hana.json
+++ b/test/json/classic-ScaleOut/restart_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "restart_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/standby_prim_node.json b/test/json/classic-ScaleOut/standby_prim_node.json
index 765654ad..1e047088 100644
--- a/test/json/classic-ScaleOut/standby_prim_node.json
+++ b/test/json/classic-ScaleOut/standby_prim_node.json
@@ -3,19 +3,19 @@
     "name": "standby primary node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -27,27 +27,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(30|1[6-9]........)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "takeover on secondary",
             "next": "final40",
@@ -55,43 +55,43 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
+            ],
             "sSite": [
-               "lpt=1[6-9]........",
-               "lss=4",
-               "srr=P",
-               "srHook=PRIM",
-               "srPoll=PRIM"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "todo": "allow pointer to prereq10",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=1[6-9]........",
+                "lss=4",
+                "srr=P",
+                "srHook=PRIM",
+                "srPoll=PRIM"
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "todo": "allow pointer to prereq10",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleOut/standby_secn_node.json b/test/json/classic-ScaleOut/standby_secn_node.json
index 686e3063..ae59404c 100644
--- a/test/json/classic-ScaleOut/standby_secn_node.json
+++ b/test/json/classic-ScaleOut/standby_secn_node.json
@@ -5,19 +5,19 @@
     "sid": "HA1",
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -30,27 +30,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
+        },
+        {
             "step": "step30",
             "name": "node back online",
             "next": "final40",
@@ -58,41 +58,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/block_manual_takeover.json b/test/json/classic-ScaleUp/block_manual_takeover.json
index 4a66bcff..41863d25 100644
--- a/test/json/classic-ScaleUp/block_manual_takeover.json
+++ b/test/json/classic-ScaleUp/block_manual_takeover.json
@@ -3,40 +3,40 @@
     "name": "blocked manual takeover",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "bmt",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 120",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "bmt",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 120",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/defaults.json b/test/json/classic-ScaleUp/defaults.json
index 54169f62..108007d8 100644
--- a/test/json/classic-ScaleUp/defaults.json
+++ b/test/json/classic-ScaleUp/defaults.json
@@ -2,48 +2,48 @@
     "opMode": "logreplay",
     "srMode": "sync",
     "checkPtr": {
-           "todo": "lpa_ha1_lpt must be flexible (like lpa_@@sid@@_lpt);",
-           "pHostUp": [
+            "todo": "lpa_ha1_lpt must be flexible (like lpa_@@sid@@_lpt);",
+            "pHostUp": [
                 "clone_state=PROMOTED",
                 "lpa_ha1_lpt=1[6-9]........",
                 "roles=4:P:master1:master:worker:master",
                 "score=150",
                 "sync_state=PRIM"
-           ],
-           "pSiteUp": [
+            ],
+            "pSiteUp": [
                 "srHook=PRIM"
-           ],
-           "sSiteUp": [
+            ],
+            "sSiteUp": [
                 "srHook=SOK"
-           ],
-           "sHostUp": [
+            ],
+            "sHostUp": [
                 "clone_state=DEMOTED",
                 "roles=4:S:master1:master:worker:master",
                 "score=100",
                 "lpa_ha1_lpt=30",
                 "sync_state=SOK"
-           ],
-           "pHostDown": [
+            ],
+            "pHostDown": [
                 "clone_state=UNDEFINED" ,
                 "roles=1:P:master1::worker:" ,
                 "score=150",
                 "standby=on",
                 "sync_state=PRIM"
-           ],
+            ],
             "pSiteDown": [
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM"
-           ],
-           "sSiteDown": [
+            ],
+            "sSiteDown": [
                 "lpt=10",
                 "srHook=SFAIL"
-           ],
-           "sHostDown": [
+            ],
+            "sHostDown": [
                 "clone_state=UNDEFINED" ,
                 "roles=1:S:master1::worker:" ,
                 "score=100" ,
                 "standby=on",
                 "srPoll=SFAIL"
-           ]
+            ]
         }
 }
diff --git a/test/json/classic-ScaleUp/free_log_area.json b/test/json/classic-ScaleUp/free_log_area.json
index 3de2d553..f1708d42 100644
--- a/test/json/classic-ScaleUp/free_log_area.json
+++ b/test/json/classic-ScaleUp/free_log_area.json
@@ -3,40 +3,40 @@
     "name": "free log area on primary",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_free_log_area",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step20",
-           "name": "still running",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 60",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "still running",
-           "next": "END",
-           "loop": 1,
-           "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_free_log_area",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step20",
+            "name": "still running",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 60",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/kill_prim_indexserver.json b/test/json/classic-ScaleUp/kill_prim_indexserver.json
index 3972ac33..e3f7bb18 100644
--- a/test/json/classic-ScaleUp/kill_prim_indexserver.json
+++ b/test/json/classic-ScaleUp/kill_prim_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill primary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,43 +54,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=SOK"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/kill_prim_inst.json b/test/json/classic-ScaleUp/kill_prim_inst.json
index 1f73386b..8330d1f2 100644
--- a/test/json/classic-ScaleUp/kill_prim_inst.json
+++ b/test/json/classic-ScaleUp/kill_prim_inst.json
@@ -3,21 +3,21 @@
     "name": "Kill primary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_prim_inst",
-           "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
-           "todo1": "allow something like lss>2, lpt>10000, score!=123",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_prim_inst",
+            "todo": "allow something like pSite=@@pSite@@ or pSite=%pSite",
+            "todo1": "allow something like lss>2, lpt>10000, score!=123",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -29,26 +29,26 @@
                 "lpt=(1[6-9]........|20)" ,
                 "srHook=(PRIM|SWAIT|SREG)" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(1[6-9]........|30)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5|0)"
-           ],
-           "sHost": [
-               "clone_state=(PROMOTED|DEMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=(PROMOTED|DEMOTED|UNDEFINED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5|0)"
+            ],
+            "sHost": [
+                "clone_state=(PROMOTED|DEMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -56,43 +56,43 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=(1[6-9]........|30|20|10)" ,
-               "srHook=(PRIM|SWAIT|SREG)" ,
-               "srPoll=PRIM"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=(1[6-9]........|30|20|10)" ,
+                "srHook=(PRIM|SWAIT|SREG)" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=(1[6-9]........|30)",
-               "lss=4",
-               "srr=(S|P)",
-               "srHook=PRIM",
-               "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(90|5)"
-           ],
-           "sHost": [
-               "clone_state=(DEMOTED|PROMOTED)" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)" ,
-               "srah=T"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=(1[6-9]........|30)",
+                "lss=4",
+                "srr=(S|P)",
+                "srHook=PRIM",
+                "srPoll=SOK"
+            ],
+            "pHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(90|5)"
+            ],
+            "sHost": [
+                "clone_state=(DEMOTED|PROMOTED)" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)" ,
+                "srah=T"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/kill_secn_indexserver.json b/test/json/classic-ScaleUp/kill_secn_indexserver.json
index 9d14c833..4f500059 100644
--- a/test/json/classic-ScaleUp/kill_secn_indexserver.json
+++ b/test/json/classic-ScaleUp/kill_secn_indexserver.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary indexserver",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_indexserver",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_indexserver",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,42 +54,42 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SFAIL",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sCCC to be the same as at test begin",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SFAIL",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sCCC to be the same as at test begin",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/kill_secn_inst.json b/test/json/classic-ScaleUp/kill_secn_inst.json
index 53f2cfce..ac57eb18 100644
--- a/test/json/classic-ScaleUp/kill_secn_inst.json
+++ b/test/json/classic-ScaleUp/kill_secn_inst.json
@@ -3,19 +3,19 @@
     "name": "Kill secondary instance",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "kill_secn_inst",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "kill_secn_inst",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "failure detected",
             "next": "step30",
@@ -27,26 +27,26 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(10|30)",
                 "lss=(1|2)",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "begin recover",
             "next": "final40",
@@ -54,41 +54,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=(1|2)",
-               "srr=S",
-               "srHook=(SFAIL|SWAIT)",
-               "srPoll=(SFAIL|SOK)"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=(UNDEFINED|DEMOTED)" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0|-1)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=(1|2)",
+                "srr=S",
+                "srHook=(SFAIL|SWAIT)",
+                "srPoll=(SFAIL|SOK)"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=(UNDEFINED|DEMOTED)" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0|-1)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/maintenance_cluster_turn_hana.json b/test/json/classic-ScaleUp/maintenance_cluster_turn_hana.json
index 15aacfa3..cdf90e80 100644
--- a/test/json/classic-ScaleUp/maintenance_cluster_turn_hana.json
+++ b/test/json/classic-ScaleUp/maintenance_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "maintenance_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_maintenance_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_maintenance_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/maintenance_with_standby_nodes.json b/test/json/classic-ScaleUp/maintenance_with_standby_nodes.json
index 07cbab5e..f9755425 100644
--- a/test/json/classic-ScaleUp/maintenance_with_standby_nodes.json
+++ b/test/json/classic-ScaleUp/maintenance_with_standby_nodes.json
@@ -5,19 +5,19 @@
     "sid": "HA1",
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites ssn",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites ssn",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "secondary site: node is standby",
             "next": "step30",
@@ -26,10 +26,10 @@
             "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
-           "pHost": "pHostUp",
-           "sHost": "sHostDown"
-       },
-       {
+            "pHost": "pHostUp",
+            "sHost": "sHostDown"
+        },
+        {
             "step": "step30",
             "name": "secondary site: node back online",
             "next": "step40",
@@ -38,43 +38,43 @@
             "todo": "pHost+sHost to check site-name",
             "pSite": "pSiteUp",
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": "pHostUp",
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "step40",
-           "name": "end recover",
-           "next": "step110",
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": "pHostUp",
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "step40",
+            "name": "end recover",
+            "next": "step110",
             "loop": 120,
             "wait": 2,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "step110",
-           "name": "test prerequitsites spn",
-           "next": "step120",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "step110",
+            "name": "test prerequitsites spn",
+            "next": "step120",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step120",
             "name": "primary site: node is standby",
             "next": "step130",
@@ -87,15 +87,15 @@
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": "pHostDown",
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": "pHostDown",
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step130",
             "name": "takeover on secondary",
             "next": "final140",
@@ -103,33 +103,33 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
             ],
             "sSite": "pSiteUp",
             "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
             ],
             "sHost": "pHostUp"
-       },
-       {
-           "step": "final140",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        },
+        {
+            "step": "final140",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/nop.json b/test/json/classic-ScaleUp/nop.json
index 872854df..6403c51e 100644
--- a/test/json/classic-ScaleUp/nop.json
+++ b/test/json/classic-ScaleUp/nop.json
@@ -3,28 +3,28 @@
     "name": "no operation - check, wait and check again (stability check)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "sleep 240",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 240",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "final40",
             "name": "still running",
             "next": "END",
             "loop": 1,
             "wait": 1,
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       }
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/restart_cluster.json b/test/json/classic-ScaleUp/restart_cluster.json
index 7018fdd2..c59f8e20 100644
--- a/test/json/classic-ScaleUp/restart_cluster.json
+++ b/test/json/classic-ScaleUp/restart_cluster.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/restart_cluster_hana_running.json b/test/json/classic-ScaleUp/restart_cluster_hana_running.json
index b7a20ca7..25ebf149 100644
--- a/test/json/classic-ScaleUp/restart_cluster_hana_running.json
+++ b/test/json/classic-ScaleUp/restart_cluster_hana_running.json
@@ -3,29 +3,29 @@
     "name": "restart_cluster_hana_running",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_hana_running",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_hana_running",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/restart_cluster_turn_hana.json b/test/json/classic-ScaleUp/restart_cluster_turn_hana.json
index cd398f38..fc1a482a 100644
--- a/test/json/classic-ScaleUp/restart_cluster_turn_hana.json
+++ b/test/json/classic-ScaleUp/restart_cluster_turn_hana.json
@@ -3,30 +3,30 @@
     "name": "restart_cluster_turn_hana",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "final40",
-           "loop": 1,
-           "wait": 1,
-           "post": "shell test_restart_cluster_turn_hana",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "remark": "pXXX and sXXX are now exchanged",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "shell test_restart_cluster_turn_hana",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "remark": "pXXX and sXXX are now exchanged",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/standby_prim_node.json b/test/json/classic-ScaleUp/standby_prim_node.json
index 765654ad..1e047088 100644
--- a/test/json/classic-ScaleUp/standby_prim_node.json
+++ b/test/json/classic-ScaleUp/standby_prim_node.json
@@ -3,19 +3,19 @@
     "name": "standby primary node (and online again)",
     "start": "prereq10",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "spn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp", 
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "spn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -27,27 +27,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=(30|1[6-9]........)",
                 "lss=4",
                 "srr=S",
                 "srHook=(PRIM|SOK)",
                 "srPoll=SOK"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=(100|145)"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=(100|145)"
+            ]
+        },
+        {
             "step": "step30",
             "name": "takeover on secondary",
             "next": "final40",
@@ -55,43 +55,43 @@
             "post": "opn",
             "wait": 2,
             "pSite": [
-               "lss=1" ,
-               "srr=P" ,
-               "lpt=10" ,
-               "srHook=SWAIT" ,
-               "srPoll=SFAIL"
-           ],
+                "lss=1" ,
+                "srr=P" ,
+                "lpt=10" ,
+                "srHook=SWAIT" ,
+                "srPoll=SFAIL"
+            ],
             "sSite": [
-               "lpt=1[6-9]........",
-               "lss=4",
-               "srr=P",
-               "srHook=PRIM",
-               "srPoll=PRIM"
-           ],
-           "pHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=150" ,
-               "standby=on"
-           ],
-           "sHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "todo": "allow pointer to prereq10",
-           "pSite": "sSiteUp",
-           "sSite": "pSiteUp",
-           "pHost": "sHostUp",
-           "sHost": "pHostUp"
-       }
+                "lpt=1[6-9]........",
+                "lss=4",
+                "srr=P",
+                "srHook=PRIM",
+                "srPoll=PRIM"
+            ],
+            "pHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=150" ,
+                "standby=on"
+            ],
+            "sHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "todo": "allow pointer to prereq10",
+            "pSite": "sSiteUp",
+            "sSite": "pSiteUp",
+            "pHost": "sHostUp",
+            "sHost": "pHostUp"
+        }
     ]
 }
diff --git a/test/json/classic-ScaleUp/standby_secn_node.json b/test/json/classic-ScaleUp/standby_secn_node.json
index 686e3063..ae59404c 100644
--- a/test/json/classic-ScaleUp/standby_secn_node.json
+++ b/test/json/classic-ScaleUp/standby_secn_node.json
@@ -5,19 +5,19 @@
     "sid": "HA1",
     "mstResource": "ms_SAPHanaCon_HA1_HDB00",
     "steps": [
-       {
-           "step": "prereq10",
-           "name": "test prerequitsites",
-           "next": "step20",
-           "loop": 1,
-           "wait": 1,
-           "post": "ssn",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp", 
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       },
-       {
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "step20",
+            "loop": 1,
+            "wait": 1,
+            "post": "ssn",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp", 
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        },
+        {
             "step": "step20",
             "name": "node is standby",
             "next": "step30",
@@ -30,27 +30,27 @@
                 "lpt=1[6-9]........" ,
                 "srHook=PRIM" ,
                 "srPoll=PRIM"
-           ],
+            ],
             "sSite": [
                 "lpt=10",
                 "lss=1",
                 "srr=S",
                 "srHook=SFAIL",
                 "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=UNDEFINED" ,
-               "roles=master1::worker:" ,
-               "score=100" ,
-               "standby=on"
-           ]
-       },
-       {
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=UNDEFINED" ,
+                "roles=master1::worker:" ,
+                "score=100" ,
+                "standby=on"
+            ]
+        },
+        {
             "step": "step30",
             "name": "node back online",
             "next": "final40",
@@ -58,41 +58,41 @@
             "wait": 2,
             "todo": "pHost+sHost to check site-name",
             "pSite": [
-               "lss=4" ,
-               "srr=P" ,
-               "lpt=1[6-9]........" ,
-               "srHook=PRIM" ,
-               "srPoll=PRIM"
-           ],
+                "lss=4" ,
+                "srr=P" ,
+                "lpt=1[6-9]........" ,
+                "srHook=PRIM" ,
+                "srPoll=PRIM"
+            ],
             "sSite": [
-               "lpt=10",
-               "lss=1",
-               "srr=S",
-               "srHook=SWAIT",
-               "srPoll=SFAIL"
-           ],
-           "pHost": [
-               "clone_state=PROMOTED" ,
-               "roles=master1:master:worker:master" ,
-               "score=150"
-           ],
-           "sHost": [
-               "clone_state=DEMOTED" ,
-               "roles=master1::worker:" ,
-               "score=(-INFINITY|0)"
-           ]
-       },
-       {
-           "step": "final40",
-           "name": "end recover",
-           "next": "END",
-           "loop": 120,
-           "wait": 2,
-           "post": "cleanup",
-           "pSite": "pSiteUp",
-           "sSite": "sSiteUp",
-           "pHost": "pHostUp",
-           "sHost": "sHostUp"
-       }
+                "lpt=10",
+                "lss=1",
+                "srr=S",
+                "srHook=SWAIT",
+                "srPoll=SFAIL"
+            ],
+            "pHost": [
+                "clone_state=PROMOTED" ,
+                "roles=master1:master:worker:master" ,
+                "score=150"
+            ],
+            "sHost": [
+                "clone_state=DEMOTED" ,
+                "roles=master1::worker:" ,
+                "score=(-INFINITY|0)"
+            ]
+        },
+        {
+            "step": "final40",
+            "name": "end recover",
+            "next": "END",
+            "loop": 120,
+            "wait": 2,
+            "post": "cleanup",
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp",
+            "sHost": "sHostUp"
+        }
     ]
 }
diff --git a/test/json/faults/faulty-syntax-flep.json b/test/json/faults/faulty-syntax-flep.json
new file mode 100644
index 00000000..ca0cafde
--- /dev/null
+++ b/test/json/faults/faulty-syntax-flep.json
@@ -0,0 +1,37 @@
+{
+    "test": "flep",
+    "name": "flep - test the json syntax check",
+    "start": "prereq10",
+    "steps": [
+        {
+            "step": "prereq10",
+            "name": "test prerequitsites",
+            "next": "final40",
+            "loop": 1,
+            "wait": 1,
+            "post": "sleep 4",
+            "pSite": [
+                "lpt >~ 2000000000:^(20|30|1.........)$",
+                "lss == 4",
+                "srr == P",
+                "srHook == PRIM",
+                "srPoll == PRIM",
+                "hugo is None"
+            ],
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        },
+        {
+            "step": "final40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+            "pSite": "pSiteUp",
+            "sSite": "sSiteUp",
+            "pHost": "pHostUp", 
+            "sHost": "sHostUp"
+        }
+    ]
+}
diff --git a/test/saphana_sr_test.py b/test/saphana_sr_test.py
index 51aab7ef..bc7ff203 100755
--- a/test/saphana_sr_test.py
+++ b/test/saphana_sr_test.py
@@ -287,16 +287,31 @@ def read_test_file(self):
         if self.config['test_file'] == "-":
             self.test_data.update(json.load(sys.stdin))
         else:
-            with open(self.config['test_file'], encoding="utf-8") as tf_fh:
-                #print(f"read test file {self.config['test_file']}")
-                self.test_data.update(json.load(tf_fh))
+            try:
+                with open(self.config['test_file'], encoding="utf-8") as tf_fh:
+                    #print(f"read test file {self.config['test_file']}")
+                    self.test_data.update(json.load(tf_fh))
+            except FileNotFoundError as e_file:
+                self.message(f"ERROR: File error: {e_file}")
+                return 1
+            except (PermissionError, Exception) as e_generic:
+                self.message(f"ERROR: File error: {e_generic}")
+                return 1
         if self.config['properties_file']:
             #print(f"read properties file {self.config['properties_file']}")
-            with open(self.config['properties_file'], encoding="utf-8") as prop_fh:
-                self.test_data.update(json.load(prop_fh))
+            try:
+                with open(self.config['properties_file'], encoding="utf-8") as prop_fh:
+                    self.test_data.update(json.load(prop_fh))
+            except FileNotFoundError as e_file:
+                self.message(f"ERROR: File error: {e_file}")
+                return 1
+            except (PermissionError, Exception) as e_generic:
+                self.message(f"ERROR: File error: {e_generic}")
+                return 1
         self.run['test_id'] = self.test_data['test']
         self.debug("DEBUG: test_data: {}".format(str(self.test_data)),
                         stdout=False)
+        return 0
 
     def write_test_properties(self, topology):
         """
@@ -347,6 +362,10 @@ def run_checks(self, checks, area_name, object_name, step_step ):
             # match <key> <comp> <regExp>
             # TODO: maybe allow flexible whitespace <key><ws><comp><ws><value>
             match_obj = re.search("(.*) (==|!=|>|>=|<|<=|~|!~|>~|is) (.*)", single_check)
+            if match_obj is None:
+                self.message(f"ERROR: step={step_step} unknown comperator in {single_check}")
+                check_result = 2
+                break
             c_key = match_obj.group(1)
             c_comp = match_obj.group(2)
             c_reg_exp = match_obj.group(3)
@@ -408,7 +427,7 @@ def run_checks(self, checks, area_name, object_name, step_step ):
                             c_err = 0
                             check_result = max(check_result, 0)
                 if c_err == 1:
-                    if not found: 
+                    if not found:
                         l_val = None
                     self.__add_failed__((area_name, object_name), (c_key, l_val, c_reg_exp, c_comp))
                     check_result = max(check_result, 1)
@@ -475,7 +494,10 @@ def process_step(self, step):
                                   self.process_topology_object(step, 'pSite', 'Site'),
                                   self.process_topology_object(step, 'sSite', 'Site'),
                                   self.process_topology_object(step, 'pHost', 'Host'),
-                                  self.process_topology_object(step, 'sHost', 'Host'))
+                                  self.process_topology_object(step, 'sHost', 'Host'),
+                                  self.process_topology_object(step, 'pWorker', 'Host'),
+                                  self.process_topology_object(step, 'sWorker', 'Host'),
+                                 )
             if process_result == 0:
                 break
             time.sleep(wait)
@@ -607,6 +629,10 @@ def action_on_cluster(self, action_name):
             cmd = "crm node standby {}".format(self.topolo['pHost'])
         elif action_name == "opn":
             cmd = "crm node online {}".format(self.topolo['pHost'])
+        elif action_name == "standby_secn_worker_node":
+            cmd = "crm node standby {}".format(self.topolo['sWorker'])
+        elif action_name == "online_secn_worker_node":
+            cmd = "crm node online {}".format(self.topolo['sWorker'])
         elif action_name == "cleanup":
             cmd = "crm resource cleanup {}".format(resource)
         elif action_name == "kill_secn_worker_node":
@@ -655,7 +681,7 @@ def action(self, action_name):
         elif action_name_short in ("kill_prim_inst", "kill_prim_worker_inst", "kill_secn_inst", "kill_secn_worker_inst", "kill_prim_indexserver", "kill_secn_indexserver",
                                    "kill_prim_worker_indexserver", "kill_secn_worker_indexserver" , "bmt"):
             action_rc = self.action_on_hana(action_name)
-        elif action_name_short in ("ssn", "osn", "spn", "opn", "cleanup", "kill_secn_node", "kill_secn_worker_node", "kill_prim_node", "kill_prim_worker_node", "simulate_split_brain"):
+        elif action_name_short in ("ssn", "osn", "spn", "opn", "cleanup", "kill_secn_node", "kill_secn_worker_node", "kill_prim_node", "kill_prim_worker_node", "simulate_split_brain","standby_secn_worker_node", "online_secn_worker_node"):
             action_rc = self.action_on_cluster(action_name)
         elif action_name_short in ("sleep", "shell"):
             action_rc = self.action_on_os(action_name)
diff --git a/test/sct_test_freeze_secn_site_nfs b/test/sct_test_freeze_secn_site_nfs
new file mode 100755
index 00000000..f642f62d
--- /dev/null
+++ b/test/sct_test_freeze_secn_site_nfs
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# test_freeze_secn_nfs - freeze nfs on secondary site
+src=${BASH_SOURCE[0]}
+full_path=$(readlink -f  "$src")
+dir_path=$(dirname "$full_path")
+source .test_properties
+currSecondary="$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'/' '/score="100"/ { print $2 }' )"
+currSecnWorker="$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'/' '/score="-12200"/ { print $2 }' )"
+
+echo "==== Freeze SAP HANA NFS ===="
+
+ssh "$currSecondary" 'iptables -I OUTPUT -p tcp -m multiport --ports 2049 -j DROP &'
+ssh "$currSecnWorker" 'iptables -I OUTPUT -p tcp -m multiport --ports 2049 -j DROP'
+sleep 60
+#
diff --git a/test/sct_test_maintenance_cluster_turn_hana b/test/sct_test_maintenance_cluster_turn_hana
index 25b20d26..7b0ba2ef 100755
--- a/test/sct_test_maintenance_cluster_turn_hana
+++ b/test/sct_test_maintenance_cluster_turn_hana
@@ -55,7 +55,15 @@ ssh "${node02}" "crm resource maintenance $mstResource on"
 ssh "$currSecondary" 'su - '"$sidadm"' -c "hdbnsutil -sr_takeover --suspendPrimary"'
 ssh "$currPrimary" 'su - '"$sidadm"' -c "hdbnsutil -sr_register --remoteHost='"$vhostSecn"' --remoteInstance='"$instNr"' --name='"$sitePrimary"' --replicationMode='"$srMode"' --operationMode='"$opMode"' --online"'
 
-sleep 30
+while true; do
+    ssh "$currSecondary" 'su - '"$sidadm"' -c "python3 exe/python_support/systemReplicationStatus.py 1>/dev/null"'; rc=$?
+    if [[ "$rc" != 15 ]]; then
+        sleep 60
+    else
+        break
+    fi
+done
+
 ssh "${node02}" 'cs_wait_for_idle -s 2'
 # shellcheck disable=SC2029
 ssh "${node02}" "crm resource refresh $mstResource"
diff --git a/test/sct_test_restart_cluster_turn_hana b/test/sct_test_restart_cluster_turn_hana
index 6e208738..a6422d56 100755
--- a/test/sct_test_restart_cluster_turn_hana
+++ b/test/sct_test_restart_cluster_turn_hana
@@ -7,6 +7,7 @@
 # - start both SAP HANA sites
 # - takeover on secondary with suspend primary (gets the new primary)
 # - register on primary in online mode (gets the new secondary)
+# - check hook cache file
 # - start cluster
 #
 # expected outcome: cluster running, SAP HANA instances running, SR roles are exchanged
@@ -23,7 +24,6 @@ ssh "${node01}" "crm resource cleanup  $mstResource"
 currPrimary="$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'/' '/score="150"/ { print $2 }' )"
 currSecondary="$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'/' '/score="100"/ { print $2 }' )"
 
-#
 #########################################
 # VHOSTS
 # get vhosts fom node names
@@ -40,17 +40,12 @@ if [[ -z "$vhostSecn ]]; then
     vhostPrim="$currSecondary"
 fi
 
-logger --id -t "sct_test_restart_cluster_turn_hana" -s "p=$currPrimary, s=$currSecondary vhostPrim=$vhostPrim vhostSecn=$vhostSecn"
-
 sitePrimary=$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'=' '$0 ~ node".site" { print $2 }' node="$currPrimary")
 sitePrimary="${sitePrimary//\"/}"
+siteSecondary=$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'=' '$0 ~ node".site" { print $2 }' node="$currSecondary")
+siteSecondary="${siteSecondary//\"/}"
 
-logger --id -t "sct_test_restart_cluster_turn_hana" -s "p=$currPrimary ($sitePrimary), s=$currSecondary"
-currSecondary="$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'/' '/score="100"/ { print $2 }' )"
-
-
-sitePrimary=$(ssh "${node01}" "SAPHanaSR-showAttr --format=tester" | awk -F'=' '$0 ~ node".site" { print $2 }' node="$currPrimary")
-sitePrimary="${sitePrimary//\"/}"
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "p=$currPrimary ($sitePrimary), s=$currSecondary, vhostPrim=$vhostPrim, vhostSecn=$vhostSecn"
 
 logger --id -t "sct_test_restart_cluster_turn_hana" -s "Stop Cluster"
 ssh "${node02}" 'crm cluster run "crm cluster stop"'
@@ -73,13 +68,44 @@ while true; do
     fi
 done
 
+cacheFile="/hana/shared/$SID/HDB$instNr/.crm_attribute.$siteSecondary"
+srHookCache=$( ssh "$currPrimary" 'cat '"$cacheFile"'' )
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "currPrimary=$currPrimary: $cacheFile: $srHookCache"
+
 logger --id -t "sct_test_restart_cluster_turn_hana" -s "SAP HANA DBs started"
 logger --id -t "sct_test_restart_cluster_turn_hana" -s "currSecondary=$currSecondary: sr_takeover suspendPrimary"
 
 ssh "$currSecondary" 'su - '"$sidadm"' -c "hdbnsutil -sr_takeover --suspendPrimary"'
+
+cacheFile="/hana/shared/$SID/HDB$instNr/.crm_attribute.$siteSecondary"
+srHookCache=$( ssh "$currPrimary" 'cat '"$cacheFile"'' )
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "currPrimary=$currPrimary: $cacheFile: $srHookCache"
+
 logger --id -t "sct_test_restart_cluster_turn_hana" -s "currPrimary=$currPrimary: sr_register online remoteHost=$vhostSecn"
 ssh "$currPrimary" 'su - '"$sidadm"' -c "hdbnsutil -sr_register --remoteHost='"$vhostSecn"' --remoteInstance='"$instNr"' --name='"$sitePrimary"' --replicationMode='"$srMode"' --operationMode='"$opMode"' --online"'
 
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "p=$currSecondary ($siteSecondary), s=$currPrimary"
+
+cacheFile="/hana/shared/$SID/HDB$instNr/.crm_attribute.$sitePrimary"
+srHookCache=$( ssh "$currSecondary" 'cat '"$cacheFile"'' )
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "currPrimary=$currSecondary: $cacheFile: $srHookCache"
+
+while true; do
+    ssh "$currSecondary" 'su - '"$sidadm"' -c "python3 exe/python_support/systemReplicationStatus.py 1>/dev/null"'; rc=$?
+    if [[ "$rc" != 15 ]]; then
+        sleep 60
+    else
+        break
+    fi
+done
+
+cacheFile="/hana/shared/$SID/HDB$instNr/.crm_attribute.$sitePrimary"
+srHookCache=$( ssh "$currSecondary" 'cat '"$cacheFile"'' )
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "currPrimary=$currSecondary: $cacheFile: $srHookCache"
+cacheFile="/hana/shared/$SID/HDB$instNr/.crm_attribute.$siteSecondary"
+srHookCache=$( ssh "$currPrimary" 'cat '"$cacheFile"'' )
+logger --id -t "sct_test_restart_cluster_turn_hana" -s "currSecondary=$currPrimary: $cacheFile: $srHookCache"
+
 logger --id -t "sct_test_restart_cluster_turn_hana" -s "Start Cluster"
 ssh "$node01" 'crm cluster run "crm cluster start"'