diff --git a/SAPHanaSR-tester.changes b/SAPHanaSR-tester.changes
index e69de29b..163549ca 100644
--- a/SAPHanaSR-tester.changes
+++ b/SAPHanaSR-tester.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Mon Nov 13 11:43:23 UTC 2023 - Fabian Herschel <fabian.herschel@suse.com>
+
+- version 1.2.4 as base for test package
diff --git a/SAPHanaSR-tester.spec b/SAPHanaSR-tester.spec
index 2b71d59e..abd3bd9e 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.2
+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/man-tester/SAPHanaSR-testCluster.8 b/man-tester/SAPHanaSR-testCluster.8
new file mode 100644
index 00000000..a39b6712
--- /dev/null
+++ b/man-tester/SAPHanaSR-testCluster.8
@@ -0,0 +1,117 @@
+.\" Version: 1.001
+.\"
+.TH SAPHanaSR-testCluster 8 "11 Nov 2023" "" "SAPHanaSR-angi"
+.\"
+.SH NAME
+SAPHanaSR-testCluster \- Run functional testing for SAPHanaSR clusters.
+.PP
+.\"
+.SH SYNOPSIS
+.\"
+\fBSAPHanaSR-testCluster\fR [ --help | --version ]
+.br
+\fBSAPHanaSR-testCluster\fR 
+
+.\"
+.SH DESCRIPTION
+.\"
+SAPHanaSR-testCluster TODO
+
+.PP
+.\"
+.SH OPTIONS
+.TP
+--testFile
+path to testcase description file
+.TP
+--defaultChecksFile
+
+.TP
+--properties
+
+.TP
+--remoteNode
+
+.TP
+--simulate
+
+.TP
+--repeat
+
+.TP
+--dumpFailures
+
+.TP
+--logFile
+
+.PP
+.\"
+.SH RETURN CODES
+.B 0
+Successful program execution.
+.br
+.B >0
+Usage, syntax or execution errors.
+.PP
+.\"
+.SH EXAMPLES
+.\"
+
+.PP
+.\"
+.SH FILES
+.\"
+/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, without HANA host auto-autofailover.
+.TP
+/usr/share/SAPHanaSR-tester/json/angi-ScaleOut-BW/
+functional tests for SAPHanaSR-angi scale-out BW scenarios, with HANA host auto-autofailover. Not yet implemented.
+.TP
+/usr/share/SAPHanaSR-tester/json/classic-ScaleUp/
+not yet implemented.
+.TP
+/usr/share/SAPHanaSR-tester/json/classic-ScaleOut/
+not yet implemented.
+.TP
+/usr/share/SAPHanaSR-tester/json/classic-ScaleOut-BW/
+not yet implemented.
+.TP
+$PWD/.test_properties
+auto-generated properties file for called shell scripts. No need to touch.
+.TP
+/usr/bin/
+TODO
+.PP
+.\"
+.SH REQUIREMENTS
+.\"
+See the REQUIREMENTS section in SAPHanaSR-tester(7).
+.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-tests-angi-ScaleUp\fP(7) , \fBSAPHanaSR-tests-angi-ScaleOut\fP(7) ,
+\fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) , \fBcrm_mon\fP(8)
+.PP
+.\"
+.SH AUTHORS
+F.Herschel, L.Pinne.
+.PP
+.\"
+.SH COPYRIGHT
+(c) 2023 SUSE Linux GmbH, Germany.
+.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-tester.7 b/man-tester/SAPHanaSR-tester.7
index 553f2dfc..0e6d1dc4 100644
--- a/man-tester/SAPHanaSR-tester.7
+++ b/man-tester/SAPHanaSR-tester.7
@@ -1,182 +1,158 @@
-.\" Version: 1.001 
+.\" Version: 1.001
 .\"
 .TH SAPHanaSR-tester 7 "11 Nov 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
-SAPHanaSR-tester \- Tools for automating functional tests of SAPHanaSR clusters.
+SAPHanaSR-tester \- Functional testing for SAPHanaSR clusters.
 .PP
 .\"
 .SH DESCRIPTION
 .\"
-\fBOverview\fP
-.PP
 SAPHanaSR-tester is a suite of tools for automating functional tests of SAP HANA
 system replication HA clusters.
 
-The test cases are defined in JSON files. Each test is separated into steps.
+Predefined functional tests are shipped for scale-up and scale-out scenarios.
+This tests could be run out-of-the-box. The predefined tests also can be used
+for creating new test definitions. So parameters for timing and expected
+attributes can be customised.
+
+The test cases are defined in dedicated files. Each test is separated into
+steps.
 For each step there is an expectation for SAPHanaSR attributes, which need to
 match. Additionally each step defines the 'next' step and an optional action
 to be triggered if the step status has been reached (all expectations match).
+See section SYNTAX below for comparators and other details.
 
 For tests involving complex actions on the cluster nodes, predefined shell
 scripts are executed remotely.
-
 .\" TODO state machine.
+
+See manual pages SAPHanaSR-tests-angi-ScaleUp(7) and
+SAPHanaSR-tests-angi-ScaleOut(7) for predefined test cases and further details.
+See also the REQUIREMENTS section below.
+
+.B SAPHanaSR-tester is shipped as technology preview.
 .PP
-\fBTest cases\fP
+.\"
+.SH SYNTAX
+.\"
+The 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.
 .PP
-Functional test are shipped for scale-up and scale-out scenarios. This tests
-could be run out-of-the-box.
+\fB*\fP Test step status
 .PP
-a. Predefined functional tests for scale-up:
-.TP
-block_manual_takeover
-blocked manual takeover
-.TP
-block_sr
-block sr and check SFAIL attribute; unblock to recover
-.TP
-block_sr_and_freeze_prim_fs
-
-.TP
-flup
-like nop but very short sleep only - only for checking the test engine
-.TP
-freeze_prim_fs
-freeze sap hana fs on primary master node
-.TP
-free_log_area
-free log area on primary
-.TP
-freeze_prim_fs
-
-.TP
-kill_prim_indexserver
-Kill primary indexserver
-.TP
-kill_prim_inst
-Kill primary instance
+Each step contains an expectation for SAPHanaSR attributes, which need to
+match. The step status are:
 .TP
-kill_prim_node
-Kill primary master node
+globalUp
+both sites are up and in sync
 .TP
-kill_secn_indexserver
-Kill secondary indexserver
+globalDown
+not yet implemented
 .TP
-kill_secn_inst
-Kill secondary instance
+pHostUp
+host p (expected to be primary before the test starts) is up  
 .TP
-kill_secn_node
-Kill secondary master node
+pSiteUp
+site p is up  
 .TP
-maintenance_cluster_turn_hana
-
-.TP
-maintenance_with_standby_nodes
-standby+online secondary then standby+online primary
-.TP
-nop
-no operation - check, wait and check again (stability check)
-.TP
-restart_cluster_hana_running
-
+sSiteUp
+site s (expected to be secondary before the test starts) is up  
 .TP
-restart_cluster
-
+sHostUp
+host s is up  
 .TP
-restart_cluster_turn_hana
-
+pHostDown
+host p is down 
 .TP
-split_brain_prio
-split brain with prio fencing to simulate fence of secondary
+pSiteDown
+site p is down 
 .TP
-standby_primary_node
-standby primary node (and online again)
+sSiteDown
+site s is down 
 .TP
-standby_secondary_node
-standby secondary node (and online again)
-.RE
+sHostDown
+host s is down 
 .PP
-b. Predefined functional tests for scale-out:
-.TP
-block_manual_takeover
-blocked manual takeover
-.TP
-free_log_area
-free log area on primary
-.TP
-kill_prim_indexserver
-Kill primary indexserver
-.TP
-kill_prim_inst
-Kill primary instance
-.TP
-kill_prim_node
-Kill primary master node
-.TP
-kill_prim_worker_indexserver
-Kill primary worker indexserver
-.TP
-kill_prim_worker_inst
-Kill primary worker instance
-.TP
-kill_prim_worker_node
-Kill primary worker node
-.TP
-kill_secn_indexserver
-Kill secondary indexserver
-.TP
-kill_secn_inst
-Kill secondary instance
+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
+final secondary site might be prefixed "p".
+.PP
+Each test step status is described by one or more conditions. Each condition
+is described by one comparision. This conditions are combined by logical "AND".
+Each comparision consists of one CIB SAPHanaSR attribute name, one comparator
+and one value or regular expression. This comparator and expression could
+contain logical "OR". A status with two conditions looks like this:
+.PP
+"\fR<test_step_status>\fP": [
+.br
+               "\fR<parameter_name> <comparator> <value>" ,
+.br
+               "\fR<parameter_name> <comparator> <value>"
+.br
+           ]
+.PP
+A set of comparators is implemented. Some take integers, some take regular
+expression. In addition the "None" TODO. 
+.\" saphana_sr_test.py
+.\" re.search("(.*) (==|!=|>|>=|<|<=|~|!~|>~|is) (.*)", single_check)
 .TP
-kill_secn_node
-Kill secondary master node
+==
+equal, integer
 .TP
-kill_secn_worker_inst
-Kill secondary worker instance
+!=
+not equal, integer
 .TP
-kill_secn_worker_node
-Kill secondary worker node
+>=
+greater or equal, integer
 .TP
-maintenance_cluster_turn_hana
-
+<=
+less or equal, interger
 .TP
-maintenance_with_standby_nodes
-standby+online secondary then standby+online primary
+>
+greater, integer
 .TP
-nop
-no operation - check, wait and check again (stability check)
+<
+less
 .TP
-restart_cluster
-
+>~
+greater or like, first field integer and second field regular expression ( <integer>:<regular_expression> )
 .TP
-restart_cluster_hana_running
-
+~
+like, regular expression
 .TP
-restart_cluster_turn_hana
-
+!~
+not like, regular expression
 .TP
-standby_primary_node
-standby primary node (and online again)
+is
+TODO, the string "None"
+.PP
+\fB*\fP Test step actions
+.PP
+TODO
 .TP
-standby_secondary_node
-standby secondary node (and online again)
+post
+action after step, [ bmt | cleanup | spn | ssn | osn | script <script> | kill_... ] 
 .RE
+See also the EXAMPLES section in manual pages SAPHanaSR-tests-angi-ScaleUp(7)
+and SAPHanaSR-tests-angi-ScaleOut(7).
 .PP
-The predefined test cases can be used for creating custom test definitions. 
-In that tests, parameters for timing and expected attributes can be customised.
-.PP
-.B SAPHanaSR-tester is shipped as technology preview.
+\fB*\fP Test properties
 .PP
-See also the REQUIREMENTS section below.
+TODO statical values, decribing the test system.
+
+See also example below.
 .PP
 .\"
 .SH EXAMPLES
-* Installing SAPHanaSR-tester.
+.\"
+\fB*\fR Installing SAPHanaSR-tester.
 .PP
-The software packages are installed on an node outside the Linux cluster.
+The SAPHanaSR-tester is installed on an node outside the Linux cluster.
 Password-less login for user root is prepared. The tester properties are
-adapted to the SAPHanaSR scale-up cluster.
+adapted to the SAPHanaSR scale-up cluster. Example scale-up cluster nodes are
+node1 and node2, SID is Q42, instance number is 85, database user key is
+TESTER.
 .PP
 .RS 2
 # zypper in SAPHanaSR-tester
@@ -204,13 +180,40 @@ adapted to the SAPHanaSR scale-up cluster.
     "mstResource": "mst_SAPHanaCon_Q42_HDB85",
 .br
     "clnResource": "cln_SAPHanaTop_Q42_HDB85"
+.br
+    "userKey": "TESTER"
 .br
 }
 .br
 :wq
 .RE
 .PP
-* Showing predefined functional test cases.
+\fB*\fR Creating an userkey for databse access.
+.PP
+A userkey for user <sid>admin is created to allow password-less login as user
+SYSTEM to the HANA database. This is needed for some test cases, e.g. 
+free_log_backup. The example user is q42admin, key is TESTER, instance number
+is 85, database user SYSTEM´s password is SuSE12345. Do this on both nodes.
+.br
+Refer to SAP HANA documentation for further information on database users,
+permissions and the user keystore.
+.PP
+# su - q42admin
+.br
+~> cd
+.br
+~> hdbuserstore SET TESTER localhost:38513 SYSTEM SuSE12345
+.br
+~> hdbuserstore LIST TESTER
+.br
+~> hdbsql -U TESTER "select * from dummy"
+.br
+~> exit
+.RE
+.PP
+Note: Do this only on test systems. Never do this on production systems.
+.PP
+\fB*\fR Showing predefined functional scale-up test cases.
 .PP
 .\" TODO
 # ls /usr/share/SAPHanaSR-tester/json/angi-ScaleUp/*.json | \\
@@ -218,7 +221,7 @@ adapted to the SAPHanaSR scale-up cluster.
 while read; do echo $REPLY; grep "name" $REPLY | head -1; done
 .RE
 .PP
-* Running a very basic functional test.
+\fB*\fR Running a very basic functional test.
 .PP
 The functional test "nop" is performed on the Linux cluster defined above.
 A dedicated working directory and logfile for this test is used. 
@@ -228,11 +231,11 @@ A dedicated working directory and logfile for this test is used.
 .br
 # export TROOT=/usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
 .br
-# SAPHanaSR-testCluster-multiNode \\
+# SAPHanaSR-testCluster \\
 .br
 --testFile $TROOT/nop.json \\
 .br
---remoteNodes node01 node02 \\
+--remoteNodes node1 node2 \\
 .br
 --defaultsFile $TROOT/defaults.json \\
 .br
@@ -241,18 +244,15 @@ A dedicated working directory and logfile for this test is used.
 --logFile test.log
 .RE
 .PP
-* Showing failed tests from logfile.
+\fB*\fR Showing failed tests from logfile.
 .PP
-Failed step 10 are ignored. That step checks for pre-requisites. A failed step
-10 means the test can not be performed successfully. Logfile is test.log.
+Logfile is test.log, shown are time, test ID, test case.
 .PP
 .RS 2
-# grep "STATUS.*FAILED" test.log | \\
-.br
-grep -v step10 | awk '{print $3}' | sort -u
+# grep "TEST:.*FAILED" test.log | awk '{print $2,$3,$5}'
 .RE
 .PP
-* Showing details for a single test.
+\fB*\fR Showing details for a single test.
 .PP
 Test ID is 8585, logfile is test.log, debug output is omitted.
 .PP
@@ -262,7 +262,7 @@ Test ID is 8585, logfile is test.log, debug output is omitted.
 .PP
 .\"
 .SH FILES
-.TP
+.\"
 /usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
 functional tests for SAPHanaSR-angi scale-up scenarios.
 .TP
@@ -286,37 +286,47 @@ auto-generated properties file for called shell scripts. No need to touch.
 .TP
 /usr/bin/
 TODO
-.RE
 .PP
 .\"
 .SH REQUIREMENTS
-.PP
+.\"
 For the current version of the SAPHanaSR-tester, the capabilities are limited
 to the following:
 .PP
-1. Resource agents and configuration of SAPHanaSR-angi.
+\fB*\fP Resource agents and configuration of SAPHanaSR-angi.
 .PP
-2. Scale-up setups with or without multi-target replication.
+\fB*\fP Scale-up setups with or without multi-target replication.
 No scale-up multi-SID (MCOS) setups.
 .PP
-3. Scale-out setups with or without multi-target replication.
+\fB*\fP Scale-out setups with or without multi-target replication.
 No HANA host auto-failover.
 .PP
-4. SAPHanaSR-tester is installed and used on an node outside the Linux cluster.
+\fB*\fP SAPHanaSR-tester is installed and used on an node outside the Linux
+cluster.
+.PP
+\fB*\fP User root needs password-less access to the Linux cluster nodes and the
+node where SAPHanaSR-tester is installed.
 .PP
-5. User root needs password-free access to the Linux cluster nodes and the node
-where SAPHanaSR-tester is installed.
+\fB*\fP On the cluster nodes, user <sid>adm has a userkey for password-less
+login as database user SYSTEM into the HANA database. This is only needed for
+some test cases.
 .PP
-6. Package python3-paramiko is needed for the tester´s multi-node feature.
+\fB*\fP Package python3-paramiko is needed for the tester´s multi-node feature.
 .PP
-7. Strict time synchronization between the cluster nodes and the tester node,
-e.g. NTP. All nodes have configured the same timezone.
+\fB*\fP Strict time synchronization between the cluster nodes and the tester
+node, e.g. NTP. All nodes have configured the same timezone.
 .PP
-8. The services pacemaker und corosync need to be enabled for this tests. 
-If disk-based SBD is used, then SBD_STARTMODE=always is needed for this tests.
+\fB*\fP The services pacemaker and corosync need to be enabled for this tests. 
+If disk-based SBD is used, then service sbd enabled and SBD_STARTMODE=always
+is needed for this tests. The stonith-action=reboot is needed in any case.
 This cluster basics might be different for production.
 .PP
-9. The tester must not be used for production systems.
+\fB*\fP Sufficient disk space, particularly for HANA transaction logs, e.g.
+/hana/log/. Depending on the backup implementation, also space for log backups
+might be needed, e.g. /hana/shared/<SID>/HDB<nr>/backup/. Strict housekeeping
+might help as well.
+.PP
+\fB*\fP The tester must not be used for production systems.
 Most tests are disruptive.
 .PP
 .\"
@@ -327,6 +337,8 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .PP
 .\"
 .SH SEE ALSO
+\fBSAPHanaSR-testCluster\fP(8) ,
+\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) ,
 .br
@@ -335,19 +347,17 @@ https://documentation.suse.com/sbp/sap/ ,
 https://documentation.suse.com/sles-sap/ ,
 .br
 https://www.suse.com/releasenotes/
-.\"
 .PP
+.\"
 .SH AUTHORS
-.br
 F.Herschel, L.Pinne.
 .PP
 .\"
 .SH COPYRIGHT
 (c) 2023 SUSE Linux GmbH, Germany.
 .br
-The package SAPHanaSR-angi comes with ABSOLUTELY NO WARRANTY.
+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-angi-ScaleOut.7 b/man-tester/SAPHanaSR-tests-angi-ScaleOut.7
new file mode 100644
index 00000000..89e7ba68
--- /dev/null
+++ b/man-tester/SAPHanaSR-tests-angi-ScaleOut.7
@@ -0,0 +1,133 @@
+.\" Version: 1.001 
+.\"
+.TH SAPHanaSR-tests-angi-ScaleOut 7 "11 Nov 2023" "" "SAPHanaSR-angi"
+.\"
+.SH NAME
+SAPHanaSR-tests-angi-ScaleOut \- Functional tests for SAPHanaSR Scale-Out.
+.PP
+.\"
+.SH DESCRIPTION
+.PP
+Functional test are shipped for scale-out scenarios. This tests
+could be run out-of-the-box.
+.\" TODO
+.PP
+\fB*\fR Predefined functional tests for scale-out:
+.TP
+block_manual_takeover
+blocked manual takeover, for susTkOver.py
+.TP
+block_sr_and_freeze_prim_master_nfs
+block sr and freeze sap hana fs on primary master node
+.TP
+block_sr_and_freeze_prim_site_nfs
+block sr and freeze sap hana fs on primary site
+.TP
+free_log_area
+free log area on primary site
+.TP
+freeze_prim_master_nfs
+freeze sap hana fs on primary master node
+.TP
+freeze_prim_site_nfs
+freeze sap hana fs on primary site
+.TP
+kill_prim_indexserver
+Kill primary master indexserver, for susChkSrv.py
+.TP
+kill_prim_inst
+Kill primary master instance
+.TP
+kill_prim_node
+Kill primary master node
+.TP
+kill_prim_worker_indexserver
+Kill primary worker indexserver, for susChkSrv.py
+.TP
+kill_prim_worker_inst
+Kill primary worker instance
+.TP
+kill_prim_worker_node
+Kill primary worker node
+.TP
+kill_secn_indexserver
+Kill secondary master indexserver, for susChkSrv.py
+.TP
+kill_secn_inst
+Kill secondary master instance
+.TP
+kill_secn_node
+Kill secondary master node
+.TP
+kill_secn_worker_inst
+Kill secondary worker instance
+.TP
+kill_secn_worker_node
+Kill secondary worker node
+.TP
+maintenance_cluster_turn_hana
+
+.TP
+maintenance_with_standby_nodes
+standby+online secondary then standby+online primary
+.TP
+nop
+no operation - check, wait and check again (stability check)
+.TP
+restart_cluster
+
+.TP
+restart_cluster_hana_running
+
+.TP
+restart_cluster_turn_hana
+
+.TP
+standby_primary_node
+standby primary node (and online again)
+.TP
+standby_secondary_node
+standby secondary node (and online again)
+.RE
+.PP
+.\"
+.SH EXAMPLES
+.PP
+.\"
+.SH FILES
+.TP
+/usr/share/SAPHanaSR-tester/json/angi-ScaleOu/
+functional tests for SAPHanaSR-angi scale-out scenarios.
+.TP
+$PWD/.test_properties
+auto-generated properties file for called shell scripts. No need to touch.
+.PP
+.\"
+.SH REQUIREMENTS
+.PP
+See the REQUIREMENTS section in SAPHanaSR-tester(7).
+.\"
+.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-angi-ScaleUp\fP(7) ,
+\fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) , \fBcrm_mon\fP(8) 
+.PP
+.\"
+.SH AUTHORS
+F.Herschel, L.Pinne.
+.PP
+.\"
+.SH COPYRIGHT
+(c) 2023 SUSE Linux GmbH, Germany.
+.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-angi-ScaleUp.7 b/man-tester/SAPHanaSR-tests-angi-ScaleUp.7
new file mode 100644
index 00000000..fbfc2b96
--- /dev/null
+++ b/man-tester/SAPHanaSR-tests-angi-ScaleUp.7
@@ -0,0 +1,122 @@
+.\" Version: 1.001 
+.\"
+.TH SAPHanaSR-tests-angi-ScaleUp 7 "11 Nov 2023" "" "SAPHanaSR-angi"
+.\"
+.SH NAME
+SAPHanaSR-tests-angi-ScaleUp \- Functional tests for SAPHanaSR Scale-Up.
+.PP
+.\"
+.SH DESCRIPTION
+.PP
+Functional test are shipped for scale-up scenarios. This tests
+could be run out-of-the-box.
+.\" TODO
+.PP
+\fB*\fR Predefined functional tests for scale-up:
+.TP
+block_manual_takeover
+blocked manual takeover, for susTkOver.py
+.TP
+block_sr
+block sr and check SFAIL attribute; unblock to recover
+.TP
+block_sr_and_freeze_prim_fs
+block sr and freeze sap hana fs on primary master node
+.TP
+flup
+like nop but very short sleep only - only for checking the test engine
+.TP
+free_log_area
+free log area on primary site
+.TP
+freeze_prim_fs
+freeze sap hana fs on primary master node
+.TP
+kill_prim_indexserver
+Kill primary indexserver, for susChkService.py
+.TP
+kill_prim_inst
+Kill primary instance
+.TP
+kill_prim_node
+Kill primary node
+.TP
+kill_secn_indexserver
+Kill secondary indexserver
+.TP
+kill_secn_inst
+Kill secondary instance
+.TP
+kill_secn_node
+Kill secondary node
+.TP
+maintenance_cluster_turn_hana
+
+.TP
+maintenance_with_standby_nodes
+standby+online secondary then standby+online primary
+.TP
+nop
+no operation - check, wait and check again (stability check)
+.TP
+restart_cluster_hana_running
+
+.TP
+restart_cluster
+
+.TP
+restart_cluster_turn_hana
+
+.TP
+split_brain_prio
+split brain with prio fencing to simulate fence of secondary
+.TP
+standby_primary_node
+standby primary node (and online again)
+.TP
+standby_secondary_node
+standby secondary node (and online again)
+.RE
+.PP
+.\"
+.SH EXAMPLES
+.PP
+.\"
+.SH FILES
+.\"
+/usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
+functional tests for SAPHanaSR-angi scale-up scenarios.
+.TP
+$PWD/.test_properties
+auto-generated properties file for called shell scripts. No need to touch.
+.PP
+.\"
+.SH REQUIREMENTS
+.\"
+See the REQUIREMENTS section in SAPHanaSR-tester(7).
+.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-angi-ScaleOut\fP(7) ,
+\fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) , \fBcrm_mon\fP(8)
+.PP
+.\"
+.SH AUTHORS
+F.Herschel, L.Pinne.
+.PP
+.\"
+.SH COPYRIGHT
+(c) 2023 SUSE Linux GmbH, Germany.
+.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/SAPHanaSR-showAttr.8 b/man/SAPHanaSR-showAttr.8
index 6d8621fa..f79341d9 100644
--- a/man/SAPHanaSR-showAttr.8
+++ b/man/SAPHanaSR-showAttr.8
@@ -290,8 +290,8 @@ Value: [ 4 | 3 | 2 | 1 | 0 ]
 This field contains the return code of landscapHostConfiguration.py. The
 parameter does not tell you if the secondary system is ready for a takeover.
 The meaning is different from common Linux return codes.
-The SAPHanaController and SAPHanaTopology RAs will interpret return code 1 as
-NOT-RUNNING (or ERROR) and return codes 2+3+4 as RUNNING.
+The SAPHanaController and SAPHanaTopology RAs will interpret return code 0 as
+FATAL, 1 as NOT-RUNNING (or ERROR) and return codes 2+3+4 as RUNNING.
 .br
 4 = OK - Everything looks perfect on the HANA primary.
 .br
diff --git a/man/ocf_suse_SAPHanaController.7 b/man/ocf_suse_SAPHanaController.7
index 08f55656..a139d03a 100644
--- a/man/ocf_suse_SAPHanaController.7
+++ b/man/ocf_suse_SAPHanaController.7
@@ -50,8 +50,10 @@ landscapeHostConfiguration.py has some detailed output about HANA system status
 and node roles. For our monitor the overall status is relevant. This overall
 status is reported by the return code of the script:
 0: Internal Fatal, 1: ERROR, 2: WARNING, 3: INFO, 4: OK
-The SAPHanaController resource agent will interpret return code 0 as FATAL, 1 as NOT-RUNNING
-(or ERROR) and return codes 2+3+4 as RUNNING.
+.br
+The SAPHanaController resource agent will interpret return code 0 as FATAL,
+1 as NOT-RUNNING (or ERROR) and return codes 2+3+4 as RUNNING. FATAL means the
+status can not be determined.
 .br
 Note: Some conditions cause HANA stopping to work, but not reporting an error. E.g. filesystem filled up. 
 .PP
@@ -125,7 +127,7 @@ Optional, well known directories will be searched by default.
 .PP
 \fBPREFER_SITE_TAKEOVER\fR
 .RS 4
-Defines whether RA should prefer to takeover to the secondary database instead of restarting the primary site locally. However a takeover will only be triggered, if the SAP HANA landscape status is on "ERROR". This option usually is choosen for HANA system replication performance-optimised setups. On the other hand local restart of the master instead of takeover could be combined with HANA's persistent memory features. Example: "PREFER_SITE_TAKEOVER=true".
+Defines whether RA should prefer to takeover to the secondary database instead of restarting the primary site locally. However a takeover will only be triggered, if the SAP HANA landscape status is on "ERROR". For "FATAL" a local restart is initiated.  PREFER_SITE_TAKEOVER usually is choosen for HANA system replication performance-optimised setups. On the other hand local restart of the master instead of takeover could be combined with HANA's persistent memory features. Example: "PREFER_SITE_TAKEOVER=true".
 .br
 Optional. Default value: false\&.
 .RE
@@ -222,14 +224,14 @@ Always returns SUCCESS. Suggested minimum timeout: 10\&.
 Reports whether the HANA instance is running. Suggested minimum timeout: 60\&.
 .RE
 .PP
-\fBmonitor (Master role)\fR
+\fBmonitor (Promoted role)\fR
 .RS 4
 Reports whether the HANA database seems to be working in multi-state mode. It also needs to check the system replication status. Suggested minimum timeout: 700\&. Suggested interval: 60\&.
 .RE
 .PP
 \fBmonitor (demoted role)\fR
 .RS 4
-Reports whether the HANA database seems to be working in multi-state mode. It also needs to check the system replication status. The secondary role's monitor interval has to be different from the primary (master) role. Suggested minimum timeout: 700\&. Suggested interval: 61\&.
+Reports whether the HANA database seems to be working in multi-state mode. It also needs to check the system replication status. The secondary role's monitor interval has to be different from the primary (promoted) role. Suggested minimum timeout: 700\&. Suggested interval: 61\&.
 .RE
 .PP
 \fBvalidate\-all\fR
diff --git a/man/ocf_suse_SAPHanaTopology.7 b/man/ocf_suse_SAPHanaTopology.7
index a682389f..331e3637 100644
--- a/man/ocf_suse_SAPHanaTopology.7
+++ b/man/ocf_suse_SAPHanaTopology.7
@@ -26,11 +26,13 @@ status and node roles. For our monitor the overall status is relevant. This
 overall status is reported by the return code of the script:
 0: Internal Fatal, 1: ERROR, 2: WARNING, 3: INFO (e.g. host auto-failover happened), 4: OK
 .br
-The SAPHanaTopology resource agent will interpret return codes 1 as
-NOT-RUNNING (or ERROR) and return codes 2+3+4 as RUNNING.
-SAPHanaTopology scans the output table of landscapeHostConfiguration.py to
-identify the roles of the cluster node. Roles means configured and current
-role of the nameserver as well as the indexserver.
+The SAPHanaTopology resource agent will interpret return code 0 as FATAL,
+1 as NOT-RUNNING (or ERROR) and return codes 2+3+4 as RUNNING. FATAL means the
+status can not be determined.
+.br
+SAPHanaTopology scans the output of landscapeHostConfiguration.py to identify
+the roles of the cluster node. Roles means configured and current role of the
+nameserver as well as the indexserver.
 .PP
 2. \fBhdbnsutil\fP
 .br
diff --git a/test/SAPHanaSR-testCluster b/test/SAPHanaSR-testCluster
index 41b69de5..3eff597d 100755
--- a/test/SAPHanaSR-testCluster
+++ b/test/SAPHanaSR-testCluster
@@ -29,28 +29,32 @@ test01 = SaphanasrTest(cmdparse=False)
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--testFile", help="specify the test file")
-parser.add_argument("--defaultChecksFile", help="specify the default checks file")
+parser.add_argument("--defaultsFile", help="specify the default checks file")
 parser.add_argument("--properties", help="specify the properties file")
-parser.add_argument("--remoteNode", help="cluster node to use for ssh connection")
+parser.add_argument("--remoteNodes", nargs="*", help="cluster nodes to use for ssh connection")
 parser.add_argument("--simulate", help="only simulate, dont call actions",
                     action="store_true")
 parser.add_argument("--repeat", help="how often to repeat the test")
 parser.add_argument("--dumpFailures", help="print failed checks per loop",
                     action="store_true")
 parser.add_argument("--logFile", help="log file to write the messages")
+parser.add_argument("--printTestProperties", help="print test properties and exit",
+                    action="store_true")
+parser.add_argument("--debug", help="output and log debug messages", action="store_true")
 args = parser.parse_args()
 if args.testFile:
     test01.message("PARAM: testFile: {}".format(args.testFile))
     test01.config['test_file'] = args.testFile
-if args.defaultChecksFile:
-    test01.message("PARAM: defaultChecksFile: {}".format(args.defaultChecksFile))
-    test01.config['defaults_checks_file'] = args.defaultChecksFile
+if args.defaultsFile:
+    test01.message("PARAM: defaultsFile: {}".format(args.defaultsFile))
+    test01.config['defaults_file'] = args.defaultsFile
 if args.properties:
     test01.message("PARAM: properties: {}".format(args.properties))
     test01.config['properties_file'] = args.properties
-if args.remoteNode:
-    test01.message("PARAM: remoteNode: {}".format(args.remoteNode))
-    test01.config['remote_node'] = args.remoteNode
+if args.remoteNodes:
+    test01.message("PARAM: remoteNodes: {}".format(args.remoteNodes))
+    test01.config['remote_node'] = args.remoteNodes[0]
+    test01.config['remote_nodes'] = args.remoteNodes
 if args.repeat:
     test01.message("PARAM: repeat: {}".format(args.repeat))
     test01.config['repeat'] = int(args.repeat)
@@ -63,9 +67,17 @@ if args.logFile:
     # disable 'consider to use with ...' - I am pretty sure with does not match here
     # pylint: disable-next=R1732
     test01.run['log_file_handle'] = open(test01.config['log_file'], 'a', encoding="utf-8")
+if args.printTestProperties:
+    test01.config['printTestProperties'] = args.printTestProperties
+    test01.message(f"PARAM: printTestProperties: {test01.config['printTestProperties']}")
+if args.debug:
+    test01.config['debug'] = args.debug
+    test01.message("PARAM: DEBUG activated")
 
 while test01.run['count'] <= test01.config['repeat']:
-    test01.run['r_id'] = random.randrange(10000,99999,1)
+    # test01.message(f"count: {test01.run['count']}")
+    if test01.run['count'] > 1:
+        test01.run['r_id'] = random.randrange(10000,99999,1)
     test01.read_saphana_sr()
     l_top = test01.topolo
     l_top.update({'global': 'global'})
@@ -76,6 +88,9 @@ while test01.run['count'] <= test01.config['repeat']:
     # sHost is the host with site-attribute == sSite
     # TODO: for angi-ScaleOut and classic-ScaleOut we might need to differ msn-host, plain-worker (no mns-candidate) and standby node
     # TODO: classic-ScaleUp
+    # TODO: allow 2 types of parameter set:
+    #       1: --testFile=... --defaultsFile=... --properties=... [ --defaultPropertiesFile=... ]
+    #       2: --testDir=...
     # pHost could be the host with roles-attr like [0-4]:P:*
     # sHost could be the host with roles-attr like [0-4]:S:*
     # pSite is referenced by pHost-site-attr
@@ -113,16 +128,39 @@ while test01.run['count'] <= test01.config['repeat']:
                 f" sWorker={l_top['sWorker']}"
             )
     test01.message(l_msg)
+
     test01.read_test_file()
+    ### debug exit after printing test properties
+    if test01.config['printTestProperties'] is True:
+        p_msg = (
+                    f"test_properties:" 
+                    f" node01={l_top.get('pHost','node01')}"
+                    f" node02={l_top.get('sHost','node02')}"
+                    f" mstResource={test01.test_data.get('mstResource','')}"
+                    f" clnResource={test01.test_data.get('clnResource','')}"
+                    f" srMode=sync"
+                    f" opMode=logreplay"
+                    f" SID={test01.test_data.get('sid','C11')}"
+                    f" instNr={test01.test_data.get('instNo','00')}"
+                    f" sidadm={test01.test_data.get('sid','C11').lower()}adm"
+                    f" userkey={test01.test_data.get('userKey','')}"
+                )
+        test01.message(p_msg)
+        break
+    test01.write_test_properties(l_top)
+
     my_test_id = test01.run['test_id']
     if test01.config['repeat'] != 1:
         test01.message("TEST: {} testNr={} ######".format(my_test_id, test01.run['count']))
     test01.run['test_rc'] = test01.process_test()
-    MSG_TEMPL = "TEST: {} testNr={} {} successfully :) ######"
+    MSG_TEMPL = "TEST: {} testNr={} testRc={} {} successfully :) ######"
     if test01.run['test_rc'] == 0:
-        test01.message(MSG_TEMPL.format(my_test_id, test01.run['count'], 'PASSED'))
+        test01.message(MSG_TEMPL.format(my_test_id, test01.run['count'], test01.run['test_rc'], 'PASSED'))
     else:
-        test01.message(MSG_TEMPL.format(my_test_id, test01.run['count'], 'FAILED'))
+        test01.message(MSG_TEMPL.format(my_test_id, test01.run['count'], test01.run['test_rc'], 'FAILED'))
     test01.run['count'] += 1
 if  test01.run['log_file_handle']:
     test01.run['log_file_handle'].close()
+if test01.run['test_rc'] == 0:
+    sys.exit (0)
+sys.exit(1)
diff --git a/test/SAPHanaSR-testCluster-multiNode b/test/SAPHanaSR-testCluster-multiNode
deleted file mode 100755
index 184a7f2d..00000000
--- a/test/SAPHanaSR-testCluster-multiNode
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/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-testCluster-multiNode
- Author:       Fabian Herschel, Mar 2023
- License:      GNU General Public License (GPL)
- Copyright:    (c) 2023 SUSE LLC
-"""
-
-# pylint: disable=unused-import
-import time
-import re
-import json
-# pylint: enable=unused-import
-#import subprocess
-import sys
-import argparse
-import random
-sys.path.insert(1, '/usr/lib/SAPHanaSR-tester')
-#pylint: disable=wrong-import-position
-from saphana_sr_test import SaphanasrTest
-#pylint: enable=wrong-import-position
-
-# TODO: impement test sequences instead of "only" repeating the same test
-test01 = SaphanasrTest(cmdparse=False)
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--testFile", help="specify the test file")
-parser.add_argument("--defaultsFile", help="specify the default checks file")
-parser.add_argument("--properties", help="specify the properties file")
-parser.add_argument("--remoteNodes", nargs="*", help="cluster nodes to use for ssh connection")
-parser.add_argument("--simulate", help="only simulate, dont call actions",
-                    action="store_true")
-parser.add_argument("--repeat", help="how often to repeat the test")
-parser.add_argument("--dumpFailures", help="print failed checks per loop",
-                    action="store_true")
-parser.add_argument("--logFile", help="log file to write the messages")
-parser.add_argument("--printTestProperties", help="print test properties and exit",
-                    action="store_true")
-args = parser.parse_args()
-if args.testFile:
-    test01.message("PARAM: testFile: {}".format(args.testFile))
-    test01.config['test_file'] = args.testFile
-if args.defaultsFile:
-    test01.message("PARAM: defaultsFile: {}".format(args.defaultsFile))
-    test01.config['defaults_file'] = args.defaultsFile
-if args.properties:
-    test01.message("PARAM: properties: {}".format(args.properties))
-    test01.config['properties_file'] = args.properties
-if args.remoteNodes:
-    test01.message("PARAM: remoteNodes: {}".format(args.remoteNodes))
-    test01.config['remote_node'] = args.remoteNodes[0]
-    test01.config['remote_nodes'] = args.remoteNodes
-    #test01.message(f"dbg: len remote_hosts: {len(test01.config['remote_nodes'])}")
-if args.repeat:
-    test01.message("PARAM: repeat: {}".format(args.repeat))
-    test01.config['repeat'] = int(args.repeat)
-if args.dumpFailures:
-    test01.message("PARAM: dumpFailures")
-    test01.config['dump_failures'] = args.dumpFailures
-if args.logFile:
-    test01.message("PARAM: logFile: {}".format(args.logFile))
-    test01.config['log_file'] = args.logFile
-    # disable 'consider to use with ...' - I am pretty sure with does not match here
-    # pylint: disable-next=R1732
-    test01.run['log_file_handle'] = open(test01.config['log_file'], 'a', encoding="utf-8")
-if args.printTestProperties:
-    test01.config['printTestProperties'] = args.printTestProperties
-    test01.message(f"PARAM: printTestProperties: {test01.config['printTestProperties']}")
-
-while test01.run['count'] <= test01.config['repeat']:
-    test01.run['r_id'] = random.randrange(10000,99999,1)
-    test01.read_saphana_sr()
-    l_top = test01.topolo
-    l_top.update({'global': 'global'})
-    # for angi-ScaleUp and classic ScaleOut:
-    # pSite is the site with srr-attribute == "P"
-    # sSite is the site with srr-attribute == "S"
-    # pHost is the host with site-attribute == pSite
-    # sHost is the host with site-attribute == sSite
-    # TODO: for angi-ScaleOut and classic-ScaleOut we might need to differ msn-host, plain-worker (no mns-candidate) and standby node
-    # TODO: classic-ScaleUp
-    # TODO: allow 2 types of parameter set:
-    #       1: --testFile=... --defaultsFile=... --properties=... [ --defaultPropertiesFile=... ]
-    #       2: --testDir=...
-    # pHost could be the host with roles-attr like [0-4]:P:*
-    # sHost could be the host with roles-attr like [0-4]:S:*
-    # pSite is referenced by pHost-site-attr
-    # sSite is referenced by sHost-site-attr
-    #
-    l_top.update({'pSite': test01.get_area_object_by_key_val('Site', {'srr': 'P'})})
-    l_top.update({'sSite': test01.get_area_object_by_key_val('Site', {'srr': 'S'})})
-    # first try to use site-msn attribute to get the master name server
-    # TODO: check, if msn could be 'misleading', if using 'virtual' SAP HANA host names
-    l_top.update({'pHost': test01.get_value('Site', l_top['pSite'], 'mns')})
-    l_top.update({'sHost': test01.get_value('Site', l_top['sSite'], 'mns')})
-
-    # get first non master-nameserver worker node for primary and secondary site
-    # TODO: check, if l_top pSite/sSite are already set correctly
-    # TODO: check for roles must be sloppy, check for site must be strict - maybe sloppy=['roles'] ??
-    l_top.update({'pWorker': test01.get_area_object_by_key_val('Host', {'site': l_top['pSite'], 'roles': ':worker:slave'}, sloppy=True)})
-    l_top.update({'sWorker': test01.get_area_object_by_key_val('Host', {'site': l_top['sSite'], 'roles': ':worker:slave'}, sloppy=True)})
-
-    if l_top['pHost'] is None:
-        # if mns attributes do not work this is most likely a classic-ScaleUp we need to query by roles
-        l_top.update({'pHost': test01.get_area_object_by_key_val('Host', {'roles': '[0-4]:P:'}, sloppy=True)})
-        l_top.update({'sHost': test01.get_area_object_by_key_val('Host', {'roles': '[0-4]:S:'}, sloppy=True)})
-        l_top.update({'pSite': test01.get_value('Host', l_top['pHost'], 'site')})
-        l_top.update({'sSite': test01.get_value('Host', l_top['sHost'], 'site')})
-
-    # TODO: do we need the old method as fallback, if msn is empty or misleading?
-    #l_top.update({'pHost': test01.get_area_object_by_key_val('Host', 'site', l_top['pSite'])})
-    #l_top.update({'sHost': test01.get_area_object_by_key_val('Host', 'site', l_top['sSite'])})
-    l_msg = (
-                f"TOPO: pSite={l_top['pSite']}"
-                f" sSite={l_top['sSite']}"
-                f" pHost={l_top['pHost']}"
-                f" sHost={l_top['sHost']}"
-                f" pWorker={l_top['pWorker']}"
-                f" sWorker={l_top['sWorker']}"
-            )
-    test01.message(l_msg)
-
-    test01.read_test_file()
-    ### debug exit after printing test properties
-    if test01.config['printTestProperties'] is True:
-        p_msg = (
-                    f"test_properties:" 
-                    f" node01={l_top.get('pHost','node01')}"
-                    f" node02={l_top.get('sHost','node02')}"
-                    f" mstResource={test01.test_data.get('mstResource','')}"
-                    f" clnResource={test01.test_data.get('clnResource','')}"
-                    f" srMode=sync"
-                    f" opMode=logreplay"
-                    f" SID={test01.test_data.get('sid','C11')}"
-                    f" instNr={test01.test_data.get('instNo','00')}"
-                    f" sidadm={test01.test_data.get('sid','C11').lower()}adm"
-                    f" userkey={test01.test_data.get('userKey','')}"
-                )
-        test01.message(p_msg)
-        break
-    test01.write_test_properties(l_top)
-
-    my_test_id = test01.run['test_id']
-    if test01.config['repeat'] != 1:
-        test01.message("TEST: {} testNr={} ######".format(my_test_id, test01.run['count']))
-    test01.run['test_rc'] = test01.process_test()
-    MSG_TEMPL = "TEST: {} testNr={} {} successfully :) ######"
-    if test01.run['test_rc'] == 0:
-        test01.message(MSG_TEMPL.format(my_test_id, 'PASSED', test01.run['count']))
-    else:
-        test01.message(MSG_TEMPL.format(my_test_id, 'FAILED', test01.run['count']))
-    test01.run['count'] += 1
-if  test01.run['log_file_handle']:
-    test01.run['log_file_handle'].close()
diff --git a/test/json/angi-ScaleOut/block_manual_takeover.json b/test/json/angi-ScaleOut/block_manual_takeover.json
index b763a77c..edff0090 100644
--- a/test/json/angi-ScaleOut/block_manual_takeover.json
+++ b/test/json/angi-ScaleOut/block_manual_takeover.json
@@ -9,7 +9,7 @@
            "next": "step20",
            "loop": 1,
            "wait": 1,
-           "post": "block_manual_takeover",
+           "post": "bmt",
            "pSite": "pSiteUp",
            "sSite": "sSiteUp",
            "pHost": "pHostUp", 
diff --git a/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json b/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json
index ca39d058..ca88015c 100644
--- a/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json
+++ b/test/json/angi-ScaleOut/maintenance_with_standby_nodes.json
@@ -10,7 +10,7 @@
            "next": "step20",
            "loop": 1,
            "wait": 1,
-           "post": "standby_secn_node",
+           "post": "ssn",
            "pSite": "pSiteUp",
            "sSite": "sSiteUp",
            "pHost": "pHostUp", 
@@ -22,7 +22,7 @@
             "next": "step30",
             "loop": 120,
             "wait": 2,
-            "post": "online_secn_node",
+            "post": "osn",
             "pSite": "pSiteUp",
             "sSite": "sSiteDown",
            "pHost": "pHostUp",
@@ -67,7 +67,7 @@
            "next": "step120",
            "loop": 1,
            "wait": 1,
-           "post": "standby_prim_node",
+           "post": "spn",
            "pSite": "pSiteUp",
            "sSite": "sSiteUp",
            "pHost": "pHostUp",
@@ -99,7 +99,7 @@
             "name": "takeover on secondary",
             "next": "step140",
             "loop": 120,
-            "post": "online_prim_node",
+            "post": "opn",
             "wait": 2,
             "pSite": [
                "lss == 1",
diff --git a/test/json/angi-ScaleOut/standby_prim_node.json b/test/json/angi-ScaleOut/standby_prim_node.json
index 07b68bf9..9e7594c1 100644
--- a/test/json/angi-ScaleOut/standby_prim_node.json
+++ b/test/json/angi-ScaleOut/standby_prim_node.json
@@ -9,7 +9,7 @@
            "next": "step20",
            "loop": 1,
            "wait": 1,
-           "post": "standby_prim_node",
+           "post": "spn",
            "pSite": "pSiteUp",
            "sSite": "sSiteUp",
            "pHost": "pHostUp", 
@@ -52,7 +52,7 @@
             "name": "takeover on secondary",
             "next": "step40",
             "loop": 120,
-            "post": "online_prim_node",
+            "post": "opn",
             "wait": 2,
             "pSite": [
                "lss == 1",
diff --git a/test/json/angi-ScaleOut/standby_secn_node.json b/test/json/angi-ScaleOut/standby_secn_node.json
index e373cd1e..45bfdfd6 100644
--- a/test/json/angi-ScaleOut/standby_secn_node.json
+++ b/test/json/angi-ScaleOut/standby_secn_node.json
@@ -9,7 +9,7 @@
            "next": "step20",
            "loop": 1,
            "wait": 1,
-           "post": "standby_secn_node",
+           "post": "ssn",
            "pSite": "pSiteUp",
            "sSite": "sSiteUp", 
            "pHost": "pHostUp",
@@ -21,7 +21,7 @@
             "next": "step30",
             "loop": 120,
             "wait": 2,
-            "post": "online_secn_node",
+            "post": "osn",
             "pSite": [
                 "lss == 4",
                 "srr == P",
diff --git a/test/json/angi-ScaleUp/flap.json b/test/json/angi-ScaleUp/flap.json
index 70bc8768..4ea38685 100644
--- a/test/json/angi-ScaleUp/flap.json
+++ b/test/json/angi-ScaleUp/flap.json
@@ -11,7 +11,7 @@
            "wait": 1,
            "post": "sleep 4",
            "pSite": [
-                "lpt >~ 2000000000:(20|30|1.........)",
+                "lpt >~ 2000000000:^(20|30|1.........)$",
                 "lss == 4",
                 "srr == P",
                 "srHook == PRIM",
diff --git a/test/json/angi-ScaleUp/flop.json b/test/json/angi-ScaleUp/flop.json
new file mode 100644
index 00000000..e213d0cd
--- /dev/null
+++ b/test/json/angi-ScaleUp/flop.json
@@ -0,0 +1,37 @@
+{
+    "test": "flop",
+    "name": "flop - this test should NOT pass successfully",
+    "start": "step10",
+    "steps": [
+       {
+           "step": "step10",
+           "name": "test prerequitsites",
+           "next": "step40",
+           "loop": 1,
+           "wait": 1,
+           "post": "sleep 4",
+           "pSite": [
+                "lpt >~ 2000000000:^(20|30|1.........)$",
+                "lss == 4",
+                "srr == P",
+                "srHook == PRIM",
+                "srPoll == PRIM",
+                "lpt is None"
+           ],
+           "sSite": "sSiteUp",
+           "pHost": "pHostUp", 
+           "sHost": "sHostUp"
+       },
+       {
+            "step": "step40",
+            "name": "still running",
+            "next": "END",
+            "loop": 1,
+            "wait": 1,
+           "pSite": "pSiteUp",
+           "sSite": "sSiteUp",
+           "pHost": "pHostUp", 
+           "sHost": "sHostUp"
+       }
+    ]
+}
diff --git a/test/json/angi-ScaleUp/flup.json b/test/json/angi-ScaleUp/flup.json
index 68a7c967..a899297a 100644
--- a/test/json/angi-ScaleUp/flup.json
+++ b/test/json/angi-ScaleUp/flup.json
@@ -1,5 +1,5 @@
 {
-    "test": "nop",
+    "test": "flup",
     "name": "flup - like nop but very short sleep only - only for checking the test engine",
     "start": "step10",
     "steps": [
diff --git a/test/saphana_sr_test.py b/test/saphana_sr_test.py
index e0341187..4f42d6a9 100755
--- a/test/saphana_sr_test.py
+++ b/test/saphana_sr_test.py
@@ -10,7 +10,7 @@
 """
 
 import time
-#import subprocess
+import subprocess
 import re
 import sys
 import json
@@ -18,13 +18,14 @@
 import random
 
 # for ssh remote calls this module uses paramiko
-from paramiko import SSHClient
+#from paramiko import SSHClient
+import paramiko
 
 class SaphanasrTest:
     """
     class to check SAP HANA cluster during tests
     """
-    version = "0.3.0"
+    version = "0.3.2"
 
     def message(self, msg, **kwargs):
         """
@@ -49,10 +50,20 @@ def message(self, msg, **kwargs):
         except OSError:
             print("{0} {1:<9s} {2}".format(date_time, "ERROR:", "Could not write log log file"), flush=True)
 
+    def debug(self, msg, **kwargs):
+        """
+        debug output/log only if option debug is set
+        """
+        if self.config['debug']:
+            self.message(msg, **kwargs)
+
     def __init__(self, *args, **kwargs):
         """
         constructor
         """
+        random.seed()
+        self.run = { 'log_file_handle': None, 'r_id': None, 'test_rc': 0, 'count': 1 }
+        self.run['r_id'] = random.randrange(10000,99999,1)
         cmdparse = kwargs.get('cmdparse', True)
         self.config = { 'test_file': "-",
                         'defaults_file': None,
@@ -62,15 +73,15 @@ def __init__(self, *args, **kwargs):
                         'dump_failures': False,
                         'remote_node': None,
                         'remote_nodes': [],
-                        'printTestProperties': False
+                        'printTestProperties': False,
+                        'debug': False
                       }
         self.dict_sr = {}
         self.test_data = {}
         self.topolo = { 'pSite': None, 'sSite': None, 'pHost': None, 'sHost': None }
-        self.run = { 'log_file_handle': None, 'r_id': None, 'test_rc': 0, 'count': 1 }
         self.message("INIT: tester version: {}".format(self.version))
         if cmdparse:
-            self.message("dbg: lib parses cmdline")
+            self.debug("DEBUG: lib parses cmdline")
             parser = argparse.ArgumentParser()
             parser.add_argument("--testFile", help="specify the test file")
             parser.add_argument("--defaultsFile", help="specify the defaults file")
@@ -108,8 +119,7 @@ def __init__(self, *args, **kwargs):
                 # pylint: disable-next=R1732
                 self.run['log_file_handle'] = open(self.config['log_file'], 'a', encoding="utf-8")
         else:
-            self.message("dbg: lib skips parsing cmdline")
-        random.seed()
+            self.debug("DEBUG: lib skips parsing cmdline")
 
     def __insert_to_area__(self, area, the_object):
         """ insert an object dictionary to an area dictionary """
@@ -151,20 +161,33 @@ def read_saphana_sr(self):
         #cmd = [ './helpSAPHanaSR-showAttr', '--format=script'  ]
         cmd = "SAPHanaSR-showAttr --format=tester"
         self.dict_sr={}
-        result_sr = self.__do_ssh__(self.config['remote_node'], "root", cmd)
-        if result_sr[2] == 20000:
-            #self.message("remote node broken !!")
-            # try other remoteNodes (if given via parameter)
-            #self.message(f"len array {len(self.config['remote_nodes'])}")
-            if len(self.config['remote_nodes']) > 1:
-                for remote_node in self.config['remote_nodes']:
-                    #self.message(f"test now with host {remote_node}")
-                    result_sr = self.__do_ssh__(remote_node, "root", cmd)
-                    if result_sr[2] != 20000:
-                        self.message(f"STATUS: get data from {remote_node}")
-                        self.config['remote_node'] = remote_node
-                        break
-        for line in result_sr[0].splitlines():
+        sr_out = ""
+        #self.message("remote node broken !!")
+        # try other remoteNodes (if given via parameter)
+        #self.message(f"len array {len(self.config['remote_nodes'])}")
+        l_remotes = [self.config['remote_node']]
+        if len(self.config['remote_nodes']) > 1:
+            l_remotes.extend(self.config['remote_nodes'])
+        for remote_node in l_remotes:
+            self.message(f"test now with host {remote_node}")
+            if remote_node == "localhost":
+                self.message("LOCAL")
+                local_sr = subprocess.run(cmd.split(), capture_output=True, check=False)
+                if local_sr.returncode != 20000:
+                    self.message("STATUS: get data from localhost")
+                    self.config['remote_node'] = remote_node
+                    sr_out = local_sr.stdout.decode()
+                    break
+            else:
+                self.message("REMOTE")
+                result_sr = self.__do_ssh__(remote_node, "root", cmd)
+                if result_sr[2] != 20000:
+                    self.message(f"STATUS: get data from {remote_node}")
+                    self.config['remote_node'] = remote_node
+                    sr_out = result_sr[0]
+                    break
+            self.message(f"STATUS: FAILED to get data from {remote_node}")
+        for line in sr_out.splitlines():
             # match and split: <area>/<object>/<key-value>
             match_obj = re.search("(.*)/(.*)/(.*)", line)
             if match_obj:
@@ -190,7 +213,7 @@ def get_area_object_by_key_val(self, area_name, search_criteria, **kwargs):
         l_sloppy = False
         if 'sloppy' in kwargs:
             l_sloppy = kwargs['sloppy']
-            self.message(f"DEBUG: DBG1 l_sloppy == {l_sloppy}")
+            self.debug(f"DEBUG: DBG1 l_sloppy == {l_sloppy}")
         object_name = None
         l_sr = self.dict_sr
         # check, if 'area' is in the sr-data-dictionary
@@ -233,7 +256,7 @@ def get_value(self, area_name, object_name, key):
                 if key in l_obj:
                     l_value = l_obj[key]
                 else:
-                    self.message(f'DEBUG: key {key} not found')
+                    self.debug(f'DEBUG: key {key} not found')
         return l_value
 
     def pretty_print(self, dictionary,level):
@@ -268,13 +291,16 @@ def read_test_file(self):
             with open(self.config['properties_file'], encoding="utf-8") as prop_fh:
                 self.test_data.update(json.load(prop_fh))
         self.run['test_id'] = self.test_data['test']
-        self.message("DEBUG: test_data: {}".format(str(self.test_data)),
+        self.debug("DEBUG: test_data: {}".format(str(self.test_data)),
                         stdout=False)
 
-    def write_test_properties(self, l_top):
+    def write_test_properties(self, topology):
+        """
+        write_test_properties - write bash test properties file so bash test helper could source the key-value settings
+        """
         with open(".test_properties", 'w', encoding="utf-8") as test_prop_fh:
-            test_prop_fh.write(f"node01={l_top.get('pHost','node01')}\n")
-            test_prop_fh.write(f"node02={l_top.get('sHost','node02')}\n")
+            test_prop_fh.write(f"node01={topology.get('pHost','node01')}\n")
+            test_prop_fh.write(f"node02={topology.get('sHost','node02')}\n")
             test_prop_fh.write(f"mstResource={self.test_data.get('mstResource','')}\n")
             test_prop_fh.write(f"clnResource={self.test_data.get('clnResource','')}\n")
             test_prop_fh.write(f"srMode={self.test_data.get('srMode','sync')}\n")
@@ -295,7 +321,7 @@ def __add_failed__(self, area_object, key_val_reg):
         ( _key, _val, _reg, _comp ) = key_val_reg
         _l_failed += f"{_key}={_val} {_comp} {_reg}; "
         self.run['failed'] = _l_failed
-        self.message("DEBUG: add-failed: " + self.__get_failed__(), stdout=False)
+        self.debug("DEBUG: add-failed: " + self.__get_failed__(), stdout=False)
 
     def __reset_failed__(self):
         """ deletes failed from the run dictionary """
@@ -327,10 +353,9 @@ def run_checks(self, checks, area_name, object_name, step_step ):
                     comp_obj = re.search("(.*):(.*)",c_reg_exp)
                     c_reg_exp_a = comp_obj.group(1)
                     c_reg_exp_b = comp_obj.group(2)
-            except Exception:
+            except (IndexError, AttributeError):
                 pass
-                #echo(f"DEBUG: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp}")
-            self.message(f"DEBUG: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp} c_reg_exp_a:{c_reg_exp_a} c_reg_exp_b:{c_reg_exp_b}")
+            self.debug(f"DEBUG: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp} c_reg_exp_a:{c_reg_exp_a} c_reg_exp_b:{c_reg_exp_b}")
             found = 0
             if area_name in l_sr:
                 l_area = l_sr[area_name]
@@ -381,14 +406,14 @@ def run_checks(self, checks, area_name, object_name, step_step ):
                 if c_err == 1:
                     self.__add_failed__((area_name, object_name), (c_key, None, c_reg_exp, c_comp))
                     check_result = max(check_result, 1)
-                    self.message(f"DEBUG: FAILED: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp} c_reg_exp_a:{c_reg_exp_a} c_reg_exp_b:{c_reg_exp_b}")
+                    self.debug(f"DEBUG: FAILED: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp} c_reg_exp_a:{c_reg_exp_a} c_reg_exp_b:{c_reg_exp_b}")
                 else:
                     check_result = max(check_result, 0)
-                    self.message(f"DEBUG: PASSED: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp} c_reg_exp_a:{c_reg_exp_a} c_reg_exp_b:{c_reg_exp_b}")
+                    self.debug(f"DEBUG: PASSED: ckey:{c_key} c_comp:{c_comp} c_reg_exp:{c_reg_exp} c_reg_exp_a:{c_reg_exp_a} c_reg_exp_b:{c_reg_exp_b}")
             if (found == 0) and (check_result < 2):
                 check_result = 2
         if self.config['dump_failures'] and 'failed' in self.run:
-            self.message(f"FAILED: step={step_step} {self.__get_failed__()}", stdout=False)
+            self.message(f"MISSED: step={step_step} {self.__get_failed__()}", stdout=False)
         return check_result
 
     def process_topology_object(self, step, topology_object_name, area_name):
@@ -398,7 +423,7 @@ def process_topology_object(self, step, topology_object_name, area_name):
             checks = step[topology_object_name]
             if isinstance(checks,str):
                 check_ptr = checks
-                self.message(f"DEBUG: check_ptr {check_ptr}", stdout=False)
+                self.debug(f"DEBUG: check_ptr {check_ptr}", stdout=False)
                 checks = self.test_data["checkPtr"][check_ptr]
             topolo = self.topolo
             if topology_object_name in topolo:
@@ -426,9 +451,9 @@ def process_step(self, step):
             step_action = ""
         _l_msg = (
                      "PROC:"
-                     f" step_id={step_id}"
+                     f" step_id='{step_id}'"
                      f" step_name='{step_name}'"
-                     f" step_next={step_next}"
+                     f" step_next='{step_next}'"
                      f" step_action='{step_action}'"
                      f" max_loops='{max_loops}'"
                  )
@@ -495,11 +520,11 @@ def process_test(self):
         test_resource = self.test_data['mstResource']
         _l_run = self.run
         _l_msg = "PROC:"
-        _l_msg += f" test_id={test_id}"
-        _l_msg += f" test_sid={test_sid}"
-        _l_msg += f" test_name={test_name}"
-        _l_msg += f" test_start={test_start}"
-        _l_msg += f" test_resource={test_resource}"
+        _l_msg += f" test_id='{test_id}'"
+        _l_msg += f" test_sid='{test_sid}'"
+        _l_msg += f" test_name='{test_name}'"
+        _l_msg += f" test_start='{test_start}'"
+        _l_msg += f" test_resource='{test_resource}'"
         self.message(_l_msg)
         r_code = self.process_steps()
         return r_code
@@ -517,10 +542,16 @@ def action_call(self, action_name, cmd, remote):
         """ do the action itself """
         action_rc = 0
         if cmd != "":
-            self.message("ACTION: {} at {}: {}".format(action_name, remote, cmd))
-            a_result = self.__do_ssh__(remote, "root", cmd)
-            action_rc = a_result[2]
-            self.message("ACTION: {} at {}: {} rc={}".format(action_name, remote, cmd, action_rc))
+            if remote == "localhost":
+                self.message("ACTION: {} LOCAL: {}".format(action_name, cmd))
+                local_call_result = subprocess.run(cmd.split(), check=False)
+                action_rc = local_call_result.returncode
+                self.message("ACTION: {} LOCAL: {} rc={}".format(action_name, cmd, action_rc))
+            else:
+                self.message("ACTION: {} REMOTE at {}: {}".format(action_name, remote, cmd))
+                a_result = self.__do_ssh__(remote, "root", cmd)
+                action_rc = a_result[2]
+                self.message("ACTION: {} REMOTE at {}: {} rc={}".format(action_name, remote, cmd, action_rc))
         return action_rc
 
     def action_on_hana(self, action_name):
@@ -631,7 +662,7 @@ def __do_ssh__(self, remote_host, user, cmd):
         """
         if remote_host:
             try:
-                ssh_client = SSHClient()
+                ssh_client = paramiko.SSHClient()
                 ssh_client.load_system_host_keys()
                 ssh_client.connect(remote_host, username=user)
                 (cmd_stdout, cmd_stderr) = ssh_client.exec_command(cmd)[1:]
@@ -640,14 +671,16 @@ def __do_ssh__(self, remote_host, user, cmd):
                 result_rc = cmd_stdout.channel.recv_exit_status()
                 check_result = (result_stdout, result_stderr, result_rc)
                 ssh_client.close()
-            # pylint: disable=broad-exception-caught
-            # TODO: improve error messages for ssh exceptions
-            except Exception:
+                self.debug(f"DEBUG: ssh cmd '{cmd}' {user}@{remote_host}: return code {result_rc}")
+            except paramiko.ssh_exception.SSHException as para_err:
+                self.message(f"FAILURE01: ssh connection to {user}@{remote_host}: {para_err}")
+                check_result=("", "", 20000)
+            except Exception as ssh_muell:
                 # except Exception as ssh_muell:
-                #self.message("ssh connection did not work ...")
-                #self.message(f"{type(ssh_muell)}")
+                self.message(f"FAILURE02: ssh connection to {user}@{remote_host}: {ssh_muell}")
                 check_result=("", "", 20000)
         else:
+            self.message("FAILURE: ssh connection to failed - remote_host not specified")
             check_result=("", "", 20000)
         return check_result
 
@@ -677,7 +710,7 @@ def __do_ssh__(self, remote_host, user, cmd):
         l_top.update({'pHost': test01.get_value('Site', l_top['pSite'], 'mns')})
         l_top.update({'sHost': test01.get_value('Site', l_top['sSite'], 'mns')})
 
-        test01.message(f"DEBUG: get 'other' worker - {test01.get_area_object_by_key_val('Host', { 'roles': ':worker:slave'}, sloppy=True)}")
+        test01.debug(f"DEBUG: get 'other' worker - {test01.get_area_object_by_key_val('Host', { 'roles': ':worker:slave'}, sloppy=True)}")
 
         if l_top['pHost'] is None:
             # if mns attributes do not work this is most likely a classic-ScaleUp we need to query by roles