rephrase GIven conditions to improve readability

code/Test_definitions/checkSimSwap.feature

@@ -30,14 +30,17 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation checkSimSwap
 
   @check_sim_swap_2_valid_sim_swap_no_max_age
   Scenario: Check that the response shows that the SIM has been swapped
-    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network that has been swapped in the last 240 hours can be deducted
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has been swapped in the last 240 hours
     When the request "checkSimSwap" is sent
     Then the response status code is 200
     And the value of response property "$.swapped" == true
 
   @check_sim_swap_3_valid_sim_swap_max_age
   Scenario Outline: Check that the response shows that the SIM has been swapped
-    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network that has been swapped in the last "<hours>" hours, where "<hours>" is equal or less than provided "maxAge" request body parameter can be deducted
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has been swapped in the last "<hours>"
+    And the "maxAge" request body property is set to a value equal or greater than "<hours>" within the allowed range
     When the request "checkSimSwap" is sent
     Then the response status code is 200
     And the value of response property "$.swapped" == true
@@ -51,22 +54,25 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation checkSimSwap
 
   @check_sim_swap_4_more_than_240_hours
   Scenario: Check that the response shows that the SIM has not been swapped when the last swap was more than 240 hours ago
-    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network that has been swapped more than 240 hours ago can be deducted
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has been swapped more than 240 hours ago
     When the request "checkSimSwap" is sent
     Then the response status code is 200
     And the value of response property "$.swapped" == false
 
   @check_sim_swap_5_out_of_max_age
   Scenario: Check that the response shows that the SIM has not been swapped when the last swap was before the maxAge field
-    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the network whose last SIM swap was more than "$.maxAge" hours ago can be deducted
-    And the request body property "$.maxAge" is set to the number of hours since the last SIM swap minus 1
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the request body property "maxAge" is set to the number of hours since the last SIM swap minus 1
+    And the last swap for this phone number's SIM was more than "maxAge" hours ago 
     When the request "checkSimSwap" is sent
     Then the response status code is 200
     And the value of response property "$.swapped" == false
 
   @check_sim_swap_6_no_sim_swap
   Scenario: Check that the response shows that the SIM has not been swapped
-    Given the request header "Authorization" is set to a valid access token from which a phone number with a SIM that has never been swapped can be deducted
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has never been swapped
     When the request "checkSimSwap" is sent
     Then the response status code is 200
     And the value of response property "$.swapped" == false
@@ -84,7 +90,7 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation checkSimSwap
 
   @check_sim_swap_8_phone_number_provided_does_not_match_the_token
   Scenario: Error when the phone number provided in the request body does not match the phone number asssociated with the access token
-    Given the request body property "$.phoneNumber" is set to a valid testing phoneNumber does not match the one associated with the token
+    Given the request body property "$.phoneNumber" is set to a valid testing phoneNumber that does not match the one associated with the token
     And the header "Authorization" is set to a valid access token
     When the request "checkSimSwap" is sent
     Then the response status code is 403

code/Test_definitions/retrieveSimSwapDate.feature

@@ -6,7 +6,7 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation retrieveSimSwapDate
   #
   # References to OAS spec schemas refer to schemas specifies in sim_swap.yaml, version 1.0.0
 
-  Get timestamp of last MSISDN <-> IMSI pairing change for a mobile user account provided with MSIDN.
+  Get timestamp of last MSISDN <-> IMSI pairing change for the provided phone number.
 
   Background: Common retrieveSimSwapDate setup
     Given the resource "sim-swap/v0/retrieve-date"
@@ -18,7 +18,7 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation retrieveSimSwapDate
   # This first scenario serves as a minimum, not testing any specific verificationResult
   @retrieve_sim_swap_date_1_generic_success_scenario
   Scenario: Common validations for any sucess scenario
-    Given the request header "Authorization" is set to a valid access token from which a testing phone number
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
     When the request "retrieveSimSwapDate" is sent
     Then the response status code is 200
     And the response header "Content-Type" is "application/json"
@@ -31,14 +31,16 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation retrieveSimSwapDate
   @retrieve_sim_swap_date_2_valid_sim_swap
   Scenario: Retrieve SIM swap date for a valid SIM swap
     Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has been swapped
     When the request "retrieveSimSwapDate" is sent
     Then the response status code is 200
     And the response property "$.latestSimChange" contains a valid timestamp
 
   # This scenario applies for operators which do not limit the "monitoring history"
   @retrieve_sim_swap_date_3_no_sim_swap_returns_activation_date
   Scenario: Response contains the sim's activation date when it hasn't been swapped
-    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network whose sim has never been swapped can be deducted
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has never been swapped
     When the request "retrieveSimSwapDate" is sent
     Then the response status code is 200
     And the response property "$.latestSimChange" contains the sim's activation timestamp
@@ -54,7 +56,8 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation retrieveSimSwapDate
   # This scenario applies when there is a local regulation with a time limitation on the information that can be returned
   @retrieve_sim_swap_date_5_no_sim_swap_or_activation_date_due_to_legal_constrain
   Scenario: Retrieves SIM swap date for a valid SIM swap
-    Given the request header "Authorization" is set to a valid access token from which a valid testing phone number for which a SimSwap event happened before the limited history window threshold can be deducted
+    Given the request header "Authorization" is set to a valid access token from which a phone number connected to the Operator's network can be deducted
+    And the SIM for this phone number has been swapped before the limited history window threshold
     When the request "retrieveSimSwapDate" is sent
     Then the response status code is 200
     And the response property "$.latestSimChange" is null
@@ -91,15 +94,6 @@ Feature: CAMARA SIM Swap API, 1.0.0 - Operation retrieveSimSwapDate
     And the response property "$.message" contains a user friendly text
 
   @retrieve_sim_swap_date_9_phone_number_not_provided_and_cannot_be_deducted_from_access_token
-  Scenario: Error when phone number can not be deducted from access token and it is not provided in the request body
-    Given the header "Authorization" is set to a valid access token from which the phone number cannot be deducted
-    When the request "retrieveSimSwapDate" is sent
-    Then the response status code is 403
-    And the response property "$.status" is 403
-    And the response property "$.code" is "INVALID_TOKEN_CONTEXT"
-    And the response property "$.message" contains a user friendly text
-
-  @retrieve_sim_swap_date_10_phone_number_not_provided_and_cannot_be_deducted_from_access_token
   Scenario: Error when phone number can not be deducted from access token and it is not provided in the request body
     Given the header "Authorization" is set to a valid access token from which the phone number cannot be deducted
     When the request "retrieveSimSwapDate" is sent