diff --git a/code/Test_definitions/Geofencing.feature b/code/Test_definitions/Geofencing.feature
new file mode 100644
index 0000000..66c6cc4
--- /dev/null
+++ b/code/Test_definitions/Geofencing.feature
@@ -0,0 +1,310 @@
+@Geofencing 
+Feature: Camara Geofencing Subscriptions API, v0.3.0 - Operations on subscriptions 
+
+# Input to be provided by the implementation to the tests
+# References to OAS spec schemas refer to schemas specified in geofencing-subscriptions.yaml, version v0.3.0
+
+  Background: Common Geofencing Subscriptions setup
+    Given the resource "{apiroot}/geofencing-subscriptions/v0.3/" as geofencing base-url                                                           
+    And the header "Authorization" is set to a valid access token
+    And the header "x-correlator" is set to a UUID value
+
+############################ Happy Path Scenarios ########################
+  @geofencing_subscriptions_01_Create_geofencing_subscription_for_a_device_sync
+   Scenario:  Create geofencing subscription (sync creation)
+    Given that subscriptions are created synchronously
+    And a valid subscription request body 
+    When the request "createSubscription" is sent 
+    Then the response code is 201
+    And the response header "Content-Type" is "application/json"
+    And the response header "x-correlator" has same value as the request header "x-correlator"
+    And the response body complies with the OAS schema at "/components/schemas/Subscription"
+
+  @geofencing_subscriptions_02_Create_geofencing_subscription_for_a_device_async
+   Scenario:  Create geofencing subscription (async creation)
+    Given that subscriptions are created asynchronously
+    And a valid subscription request body 
+    When the request "createSubscription" is sent 
+    Then the response code is 202
+    And the response header "Content-Type" is "application/json"
+    And the response header "x-correlator" has same value as the request header "x-correlator"
+    And the response body complies with the OAS schema at "#/components/schemas/SubscriptionAsync"
+
+  @geofencing_subscriptions_03_Operation_to_retrieve_list_of_subscriptions_when_no_records
+   Scenario: Get a list of subscriptions when no subscriptions available
+    Given a client without subscriptions created
+    When the request "retrieveGeofencingSubscriptionList" is sent 
+    Then the response code is 200
+    And the response header "Content-Type" is "application/json"
+    And the response header "x-correlator" has same value as the request header "x-correlator"
+    And the response body is an empty array
+
+  @geofencing_subscriptions_04_Operation_to_retrieve_list_of_subscriptions
+   Scenario: Get a list of subscriptions  
+    Given a client with subscriptions created
+    When the request "retrieveGeofencingSubscriptionList" is sent 
+    Then the response code is 200
+    And the response header "Content-Type" is "application/json"
+    And the response header "x-correlator" has same value as the request header "x-correlator"
+    And the response body has an array of items and each item complies with the OAS schema at "/components/schemas/Subscription"
+
+  @geofencing_subscriptions_05_Operation_to_retrieve_subscription_based_on_an_existing_subscription-id
+   Scenario: Get a subscription based on existing subscription-id.
+    Given the path parameter "subscriptionId" is set to the identifier of an existing subscription
+    When the request "retrieveGeofencingSubscription" is sent
+    Then the response code is 200
+    And the response header "Content-Type" is "application/json"
+    And the response header "x-correlator" has same value as the request header "x-correlator"
+    And the response body complies with the OAS schema at "/components/schemas/Subscription"
+
+  @geofencing_subscriptions_06_Operation_to_delete_subscription_based_on_an_existing_subscription-id
+   Scenario: Delete a subscription based on existing subscription-id.
+    Given the path parameter "subscriptionId" is set to the identifier of an existing subscription
+    When the request "deleteGeofencingSubscription" is sent
+    Then the response code is 202 or 204
+    And the response header "x-correlator" has same value as the request header "x-correlator"
+    And if the response property $.status is 204 then response body is not available
+    And if the response property $.status is 202 then response body complies with the OAS schema at "/components/schemas/SubscriptionAsync"	
+
+ @geofencing_subscriptions_07_Receive_notification_when_device_enters_geofence
+   Scenario: Receive notification for area-entered event
+    Given a valid subscription request body 
+    And the request body property "$.area" is set to circle which covers location "Place1" 
+    And the request body property "$.type" is "area-entered"	
+    When the request "createSubscription" is sent
+    Then the response code is 201
+    Then the device entered location "Place1"
+    Then event notification "area-entered" is received on callback-url
+    And sink credentials are received as expected
+    And notification body complies with the OAS schema at "##/components/schemas/EventAreaEntered"
+    And type="org.camaraproject.geofencing-subscriptions.v0.area-entered"
+	
+  @geofencing_subscriptions_08_receive_notification_when_device_leaves_geofence
+   Scenario: Receive notification for area-left event
+    Given a valid subscription request body 
+    And the request body property "$.area" is set to circle which covers location "Place1" 
+    And the request body property "$.type" is "area-left" 
+    When the request "createSubscription" is sent
+    Then the response code is 201
+    Then the device left from location "Place1" 
+    Then event notification "area-left" is received on callback-url
+    And sink credentials are received as expected
+    And notification body complies with the OAS schema at "##/components/schemas/EventAreaLeft"
+    And type="org.camaraproject.geofencing-subscriptions.v0.area-left"
+	
+ @geofencing_subscriptions_09_subscription_ends_on_expiry
+   Scenario: Receive notification for subscription-ends event on expiry  
+    Given a valid subscription request body 
+    And the request body property "$.area" is set to circle which covers location "Place1" 
+    And the request body property "$.type" is "area-left"
+    And the request body property "$.subscriptionExpireTime" is set to a value in the near future
+    When the request "createSubscription" is sent
+    Then the response code is 201 
+    Then the subscription is expired
+    Then event notification "subscription-ends" is received on callback-url
+    And notification body complies with the OAS schema at "##/components/schemas/EventSubscriptionEnds"
+    And type="org.camaraproject.geofencing-subscriptions.v0.subscription-ends"
+    And the response property "$.terminationReason" is "SUBSCRIPTION_EXPIRED"
+    
+  @geofencing_subscriptions_10_subscription_ends_on_max_events
+   Scenario: Receive notification for subscription-ends event on max events reached 
+    Given a valid subscription request body 
+    And the request body property "$.area" is set to circle which covers location "Place1" 
+    And the request body property "$.type" is "area-left"
+    And the request body property "$.subscriptionMaxEvents" is set to 1 
+    When the request "createSubscription" is sent
+    Then the response code is 201 
+    Then the device left from location "Place1" 
+    Then event notification "area-left" is received on callback-url
+    Then event notification "subscription-ends" is received on callback-url
+    And notification body complies with the OAS schema at "##/components/schemas/EventSubscriptionEnds"
+    And type="org.camaraproject.geofencing-subscriptions.v0.subscription-ends"And the response property "$.terminationReason" is "MAX_EVENTS_REACHED"
+		
+  @geofencing_subscriptions_11_subscription_delete_event_validation
+   Scenario: Receive notification for subscription-ends event on deletion 
+    Given a valid subscription request body 
+    When the request "createSubscription" is sent
+    Then the response code is 201 
+    And path parameter "subscriptionId" is set to the identifier of an existing subscription created 
+    When the request "deleteGeofencingSubscription" is sent
+    Then the response code is 202 or 204	
+    Then event notification "subscription-ends" is received on callback-url
+    And notification body complies with the OAS schema at "##/components/schemas/EventSubscriptionEnds"
+    And type="org.camaraproject.geofencing-subscriptions.v0.subscription-ends"
+    And the response property "$.terminationReason" is "SUBSCRIPTION_DELETED"
+	
+########################### Error response scenarios ############################################
+@geofencing_subscriptions_12_create_geofencing_subscription_for_a_device_with_invalid_parameter
+  Scenario:  Create geofencing subscription with invalid parameter
+    Given the request body is not compliant with the schema "/components/schemas/SubscriptionRequest"
+    When the  request "createSubscription" is sent 
+    Then the response code is 400
+    And the response property "$.status" is 400
+    And the response property "$.code" is "INVALID_ARGUMENT"
+    And the response property "$.message" contains a user friendly text
+
+ @geofencing_subscriptions_13_creation_of_subscription_with_expiry_time_in_past
+  Scenario: Expiry time in past
+    Given a valid subscription request body 
+    And request body property "$.subscriptionexpiretime" in past
+    When the request "createSubscription" is sent 
+    Then the response code is 400
+    And the response property "$.status" is 400
+    And the response property "$.code" is "INVALID_ARGUMENT"
+    And the response property "$.message" contains a user friendly text
+	  	
+ @geofencing_subscription_14_creation_with_invalid_eventType
+   Scenario: Subscription creation with invalid event type
+    Given a valid subscription request body 
+    And the request body property "$.types" is set to invalid value  
+    When the request "createSubscription" is sent
+    Then the response property "$.status" is 400
+    And the response property "$.code" is "INVALID_ARGUMENT"
+    And the response property "$.message" contains a user friendly text
+    
+  @geofencing_subscription_15_invalid_protocol
+   Scenario: Subscription creation with invalid protocol
+    Given a valid subscription request body 
+    When the request "createSubscription" is sent
+    And the request property "$.types" is set to "org.camaraproject.geofencing-subscriptions.v0.area-entered"
+    And the request property "$.protocol" is not set to "HTTP"
+    And the request property "$.config.subscriptionDetail.phoneNumber" is set with provided phoneNumber
+    And the request property "$.sink" is set to provided callbackUrl
+    Then the response property "$.status" is 400
+    And the response property "$.code" is "INVALID_PROTOCOL"
+    And the response property "$.message" contains a user friendly text
+
+  @geofencing_subscription_16_invalid_credential
+  Scenario: Subscription creation with invalid credential
+    Given a valid subscription request body 
+    When the request "createSubscription" is sent
+    And the request property "$.types" is set to "org.camaraproject.geofencing-subscriptions.v0.area-entered"
+    And the request property "$.protocol" is set to "HTTP"
+    And the request property "$.config.subscriptionDetail.phoneNumber" is set with with provided phoneNumber
+    And the request property "$.sink" is set to provided callbackUrl
+    And the request property "$.sinkCredential.credentialType" is not set to "ACCESSTOKEN"
+    And the request property "$.sinkCredential.accessTokenType" is set to "bearer"
+    And the request property "$.sinkCredential.accessToken" is valued with a valid value
+    And the request property "$.sinkCredential.accessTokenExpiresUtc" is valued with a valid value
+    Then the response property "$.status" is 400
+    And the response property "$.code" is "INVALID_CREDENTIAL"
+    And the response property "$.message" contains a user friendly text
+
+  @geofencing_subscription_17_invalid_token
+  Scenario: Subscription creation with invalid token
+    Given a valid subscription request body
+    When the request "createSubscription" is sent
+    And  the request property "$.types"="org.camaraproject.geofencing-subscriptions.v0.area-entered"
+    And  the request property "$.protocol" is set to "HTTP"
+    And the request property "$.sink" is set to provided callbackUrl
+    And the request property "$.sinkCredential.credentialType" is set to "ACCESSTOKEN"
+    And the request property "$.sinkCredential.accessTokenType" is not set to "bearer"
+    And the request property "$.sinkCredential.accessToken" is valued with a valid value
+    And the request property "$.sinkCredential.accessTokenExpiresUtc" is valued with a valid value
+    Then the response property "$.status" is 400
+    And the response property "$.code" is "INVALID_TOKEN" or "INVALID_ARGUMENT"
+    And the response property "$.message" contains a user friendly text
+
+  @geofencing_subscriptions_18_no_authorization_header_for_create_subscription
+  Scenario: No Authorization header for create subscription
+    Given a valid subscription request body and header "Authorization" is not set to 
+    When the request "createSubscription" is sent 
+    Then the response status code is 401
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+
+  @geofencing_subscriptions_19_expired_access_token_for_create_subscription
+  Scenario: Expired access token for create subscription
+    Given a valid subscription request body and header "Authorization" is expired
+    When the request "createSubscription" is sent
+    Then the response status code is 401
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+
+  @geofencing_subscriptions_20_invalid_access_token_for_create_subscription
+  Scenario: Invalid access token for create subscription
+    Given a valid subscription request body 
+    And header "Authorization" set to an invalid access token
+    When the request "createSubscription" is sent
+    Then the response status code is 401
+    And the response header "Content-Type" is "application/json"
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+		
+@geofencing_subscriptions_21_no_authorization_header_for_get_subscription
+  Scenario: No Authorization header for get subscription
+    Given header "Authorization" is not set to valid token
+    And path parameter "subscriptionId" is set to the identifier of an existing subscription
+    When the request "retrieveGeofencingSubscription" is sent 
+    Then the response status code is 401
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+
+@geofencing_subscriptions_22_expired_access_token_for_get_subscription
+  Scenario: Expired access token for get subscription
+    Given the header "Authorization" is set to expired token
+    When the request "retrieveGeofencingSubscription" is sent
+    Then the response status code is 401
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+    
+@geofencing_subscriptions_23_invalid_access_token_for_get_subscription
+  Scenario: Invalid access token for get subscription
+    Given the header "Authorization" set to an invalid access token
+    When the request "retrieveGeofencingSubscription" is sent
+    Then the response status code is 401
+    And the response header "Content-Type" is "application/json"
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+    
+@geofencing_subscriptions_23_no_authorization_header_for_delete_subscription
+  Scenario: No Authorization header for delete subscription
+    Given header "Authorization" is set without a token
+    When the request "deleteGeofencingSubscription" is sent 
+    Then the response status code is 401
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+
+@geofencing_subscriptions_24_expired_access_token_for_delete_subscription
+  Scenario: Expired access token for delete subscription
+    Given header "Authorization" is set with an expired token
+    When the request "deleteGeofencingSubscription" is sent
+    Then the response status code is 401
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+
+@geofencing_subscriptions_25_invalid_access_token_for_delete_subscription
+  Scenario: Invalid access token for delete subscription
+    Given header "Authorization" set to an invalid access token
+    When the request "deleteGeofencingSubscription" is sent
+    Then the response status code is 401
+    And the response header "Content-Type" is "application/json"
+    And the response property "$.status" is 401
+    And the response property "$.code" is "UNAUTHENTICATED"
+    And the response property "$.message" contains a user friendly text
+
+@geofencing_subscriptions_26_get_unknown_geofencing_subscription_for_a_device
+  Scenario:  Get method for geofencing subscription with subscription-id unknown to the system  
+    Given the path parameter "subscriptionId" is set to the value unknown to system
+    When the request "retrieveGeofencingSubscription" is sent
+    Then the response  code is 404
+    And the response property "$.status" is 404
+    And the response property "$.code" is "NOT_FOUND"
+    And the response property "$.message" contains a user friendly text
+
+ @geofencing_subscriptions_27_delete_invalid_geofencing_subscription_for_a_device
+  Scenario:  Delete geofencing subscription with subscription-id unknown to the system
+    Given the path parameter "subscriptionId" is set to the value unknown to system
+    When the request "deleteGeofencingSubscription" is sent
+    Then the response code is 404
+    And the response property "$.status" is 404
+    And the response property "$.code" is "NOT_FOUND"
+    And the response property "$.message" contains a user friendly text