diff --git a/.gitignore b/.gitignore
index 2ccbd780b2355b4c7683909abf310eb7c80cd2bb..3fd0a5992c1b1c46e548c4e2fb9f1364289e849b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ local.properties
 logs
 QA.log
 out
+.DS_Store
 
 # Java
 # Compiled class file
diff --git a/features/evaluatePolicyGroups.feature b/features/evaluatePolicyGroups.feature
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/features/evaluatePolicyAsync.feature b/features/executeTask.feature
similarity index 88%
rename from features/evaluatePolicyAsync.feature
rename to features/executeTask.feature
index 31f6d7d47811d2f1549f17049acde7d1a9efcaff..b2c90306f790bcf715ae26b47838dc0b1a56d0b1 100644
--- a/features/evaluatePolicyAsync.feature
+++ b/features/executeTask.feature
@@ -2,7 +2,7 @@ As user
 I want to evaluate the policy asyncronously
 So I am able to execute the developed Rego code in the future non-blocking
 
-Scenario: Evaluate the policy asyncronously
+Scenario: Execute the task during evaluating policy
 Given long running policy is uploaded to the system
 And the task template is uploaded to the system
 When I evaluate the policy asyncronously 
@@ -10,7 +10,7 @@ And the task template is specifyed as an input
 When I get successful response
 And the response contains taskId
 
-Scenario: Getting the result for the executed policy
+Scenario: Getting the result for the executed task
 Given long running policy is executed
 When I request the result of execution
 And request contains the taskId
diff --git a/features/ocmCommunication.feature b/features/ocmCommunication.feature
new file mode 100644
index 0000000000000000000000000000000000000000..7d06b2b9c22a530b22a6ef9407848360acbef81e
--- /dev/null
+++ b/features/ocmCommunication.feature
@@ -0,0 +1,12 @@
+As policy administrator
+I want to evaluate OCM communication feature
+So I am able to create policies to control login functionality
+
+Scenario: Make OCM requests
+Given the policy to query OCM is uploaded to the system
+When I make the request to the OCM
+And the request contains the path
+And the request contains the input JSON object
+Then I get successful response
+And it contains the output JSON object
+
diff --git a/features/resolveDID.feature b/features/resolveDIDSync.feature
similarity index 100%
rename from features/resolveDID.feature
rename to features/resolveDIDSync.feature