---
 .../A and C Enable/Test Cases/Test_008.js             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/UACTT_project/maintree/Alarms and Conditions/A and C Enable/Test Cases/Test_008.js b/UACTT_project/maintree/Alarms and Conditions/A and C Enable/Test Cases/Test_008.js
index 41f5739f..78818266 100755
--- a/UACTT_project/maintree/Alarms and Conditions/A and C Enable/Test Cases/Test_008.js	
+++ b/UACTT_project/maintree/Alarms and Conditions/A and C Enable/Test Cases/Test_008.js	
@@ -84,7 +84,7 @@ function Test_008 () {
             }
         } else if ( this.State == this.States.WaitingForLastCall ) {
             if ( now > this.TargetLastCallLocalTime ) {
-                this.MethodCall( collector, this.CallType.SecondCall, this.States.Completed );
+                this.MethodCall( collector, this.CallType.FinalCall, this.States.Completed );
             }
         }
 
@@ -94,7 +94,7 @@ function Test_008 () {
                 var isComplete = true;
                 this.TestCaseMap.Iterate( function ( conditionIdString, localTestCase, args ) {
                     var testCaseComplete = false;
-                    if ( localTestCase.Failed || localTestCase.Finished ) {
+                    if ( localTestCase.Failed || localTestCase.Completed ) {
                         testCaseComplete = true;
                     }
                     if ( !testCaseComplete ) {
@@ -114,9 +114,11 @@ function Test_008 () {
         var runEnableAll = false;
 
         var testMethods = [];
+        // Avoid disabling all alarms on first call otherwise this function might never be called again         
+        var firstTCandFirstMC = callType == this.CallType.FirstCall;
         this.TestCaseMap.Iterate( function ( conditionIdString, testCase, args ) {
 
-            if ( !testCase.Completed ) {
+            if ( !testCase.Completed && !firstTCandFirstMC) {
                 var methodId = args.ThisTest.EnableNodeId;
                 if ( !testCase.SetToDisabled ) {
 
@@ -135,6 +136,8 @@ function Test_008 () {
                     MethodId: methodId,
                     ObjectId: testCase.ConditionIdVariant
                 } );
+            }else{
+                firstTCandFirstMC = false;
             }
 
         }, { ThisTest: this } );
@@ -299,7 +302,7 @@ function Test_008 () {
     this.EndTest = function ( collector ) {
         this.TestCaseMap.Iterate( function ( conditionIdString, localTestCase, args ) {
             if ( !localTestCase.SetToEnabled ) {
-                args.Collector.EnableAlarm( localTestCase.ConditionId );
+                args.Collector.EnableAlarm( localTestCase.ConditionIdVariant );
             }
         }, { Collector: collector } );
     }
-- 
2.43.0