Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r135c320c850b09365c04e03d95195412c12fba72 -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 135c320c850b09365c04e03d95195412c12fba72)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4)
@@ -132,6 +132,8 @@
     readonly property int ultrafiltrationProgressBarRadius      : 3
     readonly property int ultrafiltrationAdjustmtenOptionWidth  : 520
     readonly property int ultrafiltrationAdjustmtenOptionHeight : 275
+    readonly property int ultrafiltrationConfirmValueWidth      : 416
+    readonly property int ultrafiltrationConfirmValueHeight     : 78
     readonly property int ultrafiltrationButtonWidth            : 300
     readonly property int ultrafiltrationButtonHeight           : 60
     readonly property int ultrafiltrationRangeMarkerWidth       : 3
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml
===================================================================
diff -u -rb2844bc11b33db3c2c5845fa6728ab3d1472e4e8 -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml	(.../TreatmentAdjustmentUltrafiltration.qml)	(revision b2844bc11b33db3c2c5845fa6728ab3d1472e4e8)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml	(.../TreatmentAdjustmentUltrafiltration.qml)	(revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4)
@@ -68,12 +68,12 @@
         }
 
         TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart
-            visible: false
+            objectName  : "_treatmentAdjustmentUltrafiltrationStart"
+            visible     : false
+
             StackView.onActivating  : {
-                _root.titleText = Qt.binding(
-                    function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume }
-                )
-                _root.notificationText = ""
+                _root.titleText         = qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
+                _root.notificationText  = ""
             }
             onPauseClicked          : {
                 // send pause to TD and wait.
@@ -95,12 +95,12 @@
         }
 
         TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit
-            visible: false
+            objectName  : "_treatmentAdjustmentUltrafiltrationEdit"
+            visible     : false
+
             StackView.onActivating  : {
-                _root.titleText = Qt.binding(
-                    function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume }
-                )
-                _root.notificationText = ""
+                _root.titleText         = qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
+                _root.notificationText  = ""
             }
             onContinueClicked       : function(vVolume) {
                 // send Volume to TD and wait.
@@ -110,12 +110,12 @@
         }
 
         TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm
-            visible: false
+            objectName  : "_treatmentAdjustmentUltrafiltrationConfirm"
+            visible     : false
+
             StackView.onActivating  : {
-                _root.titleText = Qt.binding(
-                    function() { return qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume }
-                )
-                _root.notificationText = ""
+                _root.titleText         = qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
+                _root.notificationText  = ""
             }
             onConfirmVolumeClicked  : {
                 vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume)
@@ -124,7 +124,10 @@
 
         Connections { target: vTreatmentAdjustmentUltrafiltrationState
             function onAdjustmentTriggered              ( vValue ) {
-                if (_treatmentAdjustmentUltrafiltrationStart.StackView.status === StackView.Active) {
+                if (vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted) {
+                    notification.text = ""
+                }
+                else {
                     notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText
                 }
             }
@@ -133,6 +136,8 @@
         Connections { target: vTreatmentAdjustmentUltrafiltrationEdit
             function onAdjustmentTriggered              ( vValue ) {
                 if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) {
+                    notification.text = ""
+
                     _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume    = vTreatmentAdjustmentUltrafiltrationEdit.volume
                     _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate      = vTreatmentAdjustmentUltrafiltrationEdit.rate
 
@@ -141,22 +146,19 @@
                     }
                 }
                 else {
-                    if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) {
-                        notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText
-                    }
+                    notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText
                 }
             }
         }
 
         Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm
             function onAdjustmentTriggered              ( vValue ) {
                 if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) {
+                    notification.text = ""
                     close()
                 }
                 else {
-                    if (_treatmentAdjustmentUltrafiltrationConfirm.StackView.status === StackView.Active) {
-                        notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText
-                    }
+                    notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText
                 }
             }
         }
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
===================================================================
diff -u -r7c550f70136f2f33520661a2e97fe99021cc681d -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4)
@@ -28,20 +28,23 @@
  *          to confirm requested changes to the treatment ultrafiltration setting.
  */
 Item { id: _root
-    objectName: "TreatmentAdjustmentUltrafiltrationConfirm"  // SquishQt testability
+    objectName: "_TreatmentAdjustmentUltrafiltrationConfirm"  // SquishQt testability
 
     property real ultrafiltrationVolume : 0.000
     property real ultrafiltrationRate   : 0.000
 
     signal confirmVolumeClicked(real vVolume)
 
     component ValueContainer: LabelUnitContainer { id: _valueContainer
+        objectName                  : "_valueContainer"
         property alias value        : _value.text
         property color valueColor   : _value.color
 
-        implicitWidth       : 416
-        implicitHeight      : 78
+        implicitWidth       : Variables.ultrafiltrationConfirmValueWidth
+        implicitHeight      : Variables.ultrafiltrationConfirmValueHeight
+
         contentItem: Text { id: _value
+            objectName: "_value"
             font {
                 pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
                 weight      : Font.DemiBold
@@ -52,7 +55,8 @@
         }
     }
 
-    Item {
+    Item { id: _newValuesItem
+        objectName: "_newValuesItem"
         anchors {
             top         : parent.top
             bottom      : _confirmButton.top
@@ -61,17 +65,20 @@
         }
 
         Row { id: _newValuesRow
+            objectName      : "_newValuesRow"
             anchors.centerIn: parent
-            spacing: Variables.columnSpacing
+            spacing         : Variables.columnSpacing
 
             ValueContainer { id: _newVolumeContainer
+                objectName  : "_newVolumeContainer"
                 text        : qsTr("New UF Volume")
                 unitText    : Variables.unitVolume
                 valueColor  : Colors.ufVolumeGoalText
                 value       : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision)
             }
 
             ValueContainer { id: _newRateContainer
+                objectName  : "_newRateContainer"
                 text        : qsTr("New UF Rate")
                 unitText    : Variables.unitTextRate
                 valueColor  : Colors.ufVolumeGoalText
@@ -81,6 +88,7 @@
     }
 
     TouchRect { id: _confirmButton
+        objectName  : "_confirmButton"
         anchors {
             bottom          : parent.bottom
             bottomMargin    : Variables.defaultMargin
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
===================================================================
diff -u -r7c550f70136f2f33520661a2e97fe99021cc681d -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(.../TreatmentAdjustmentUltrafiltrationEdit.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(.../TreatmentAdjustmentUltrafiltrationEdit.qml)	(revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4)
@@ -28,9 +28,10 @@
  *          To adjust the treatment ultrafiltration
  */
 Item { id: _root
-    objectName: "TreatmentAdjustmentUltrafiltrationEdit"  // SquishQt testability
+    objectName: "_TreatmentAdjustmentUltrafiltrationEdit"  // SquishQt testability
 
     QtObject { id: _private
+        objectName: "_private"
         readonly property real minimum          : calculatePrecisionValue(   vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min )
         readonly property real maximum          : calculatePrecisionValue(   vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max )
         readonly property real volumeRes        : calculatePrecisionValue(   vTreatmentRanges.ultrafiltrationVolumeRes                   )
@@ -50,6 +51,7 @@
     }
 
     TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics
+        objectName          : "_ufMetrics"
         anchors {
             top             : parent.top
             topMargin       : Variables.defaultMargin
@@ -76,7 +78,7 @@
             spacing             : 80
 
             ProgressBar { id: _maxVolumeBar
-                objectName: "_maxVolumeBar"
+                objectName      : "_maxVolumeBar"
                 width           : parent.width
                 height          : Variables.ultraFiltrationProgressBarHeight
                 marker.visible  : false
@@ -105,6 +107,7 @@
                 value   : _volumeGoalAdjuster.value
 
                 Rectangle { id: _removedFill
+                    objectName: "_removedFill"
                     anchors {
                         top         : parent.top
                         bottom      : parent.bottom
@@ -119,6 +122,7 @@
                 }
 
                 RangeMarker { id: _lowMarker
+                    objectName      : "_lowMarker"
                     anchors.bottom  : parent.bottom
                     x               : (_maxVolumeBar.width * ((value - _maxVolumeBar.minimum) / (_maxVolumeBar.maximum - _maxVolumeBar.minimum))) - ((width+1)/2)
                     z               : _removedFill.z + 1
@@ -154,7 +158,7 @@
                     step            : _private.volumeRes
                     value           : { value = _private.setVolume } // set without binding
 
-                    onDidChange     : function(vValue) {
+                    onDidChange     : {
                         value = _private.calculatePrecisionValue(vValue)
                     }
                     onMinimumChanged: {
@@ -173,6 +177,7 @@
     }
 
     TouchRect { id: _continueButton
+        objectName  : "_continueButton"
         anchors {
             bottom          : parent.bottom
             bottomMargin    : Variables.defaultMargin
@@ -186,6 +191,9 @@
         }
         isDefault   : true
         enabled     : _volumeGoalAdjuster.value !== _private.setVolume
-        onClicked   : continueClicked(_volumeGoalAdjuster.value)
+
+        onClicked   : {
+            continueClicked(_volumeGoalAdjuster.value)
+        }
     }
 }
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
===================================================================
diff -u -r135c320c850b09365c04e03d95195412c12fba72 -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision 135c320c850b09365c04e03d95195412c12fba72)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4)
@@ -28,9 +28,10 @@
  *          To adjust the treatment ultrafiltration
  */
 Item { id: _root
-    objectName: "TreatmentAdjustmentUltrafiltrationStart"  // SquishQt testability
+    objectName: "_TreatmentAdjustmentUltrafiltrationStart"  // SquishQt testability
 
     QtObject { id: _private
+        objectName: "_private"
         readonly property real minimum  : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min
         readonly property real maximum  : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max
         property real setVolume         : vTreatmentUltrafiltration.setVolume
@@ -43,6 +44,7 @@
     signal resumeClicked()
 
     TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics
+        objectName: "_ufMetrics"
         anchors {
             top             : parent.top
             topMargin       : Variables.defaultMargin
@@ -53,6 +55,7 @@
     }
 
     Item { id: _contentArea
+        objectName: "_contentArea"
         anchors {
             top         : _ufMetrics.bottom
             bottom      : _buttonArea.top
@@ -61,6 +64,7 @@
         }
 
         ProgressBarEx { id: _progressBarEx
+            objectName: "_progressBarEx"
             anchors {
                 centerIn    : parent
             }
@@ -106,6 +110,7 @@
     }
 
     Row { id: _buttonArea
+        objectName: "_buttonArea"
         anchors {
             bottom          : parent.bottom
             bottomMargin    : Variables.defaultMargin
@@ -114,6 +119,7 @@
         spacing             : Variables.defaultMargin
 
         TouchRect { id: _pauseResumeButton
+            objectName  : "_pauseResumeButton"
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {
@@ -125,6 +131,7 @@
         }
 
         TouchRect { id: _editButton
+            objectName  : "_editButton"
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {
@@ -136,6 +143,7 @@
         }
 
         TouchRect { id: _isolatedUfButton
+            objectName  : "_isolatedUfButton"
             width       : Variables.defaultButtonWidth
             height      : Variables.defaultButtonHeight
             text {