diff --git a/openecomp-bdd/features/InterfaceOperation/TestInterfaceOperation.feature b/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature
similarity index 75%
rename from openecomp-bdd/features/InterfaceOperation/TestInterfaceOperation.feature
rename to openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature
index dfd754f..9f3cd54 100644
--- a/openecomp-bdd/features/InterfaceOperation/TestInterfaceOperation.feature
+++ b/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature
@@ -11,6 +11,8 @@
   Then I want to check property "uniqueId" exists
   And  I want to create an Operation
   Then I want to check property "uniqueId" exists
+  When I want to create an Operation with input output
+  Then I want to check property "uniqueId" exists
 
    #List All Operations
   When I want to list Operations
@@ -26,12 +28,12 @@
   When I want to delete an Operation
 
   #Checkin
-  When I want to checkin this VF
+  When I want to checkin this component
   Then I want to check property "lifecycleState" for value "NOT_CERTIFIED_CHECKIN"
 
-  #Submit
-  Then I want to submit this VF
-  And I want to check property "lifecycleState" for value "READY_FOR_CERTIFICATION"
+  #Certify
+  Then I want to certify this component
+  And I want to check property "lifecycleState" for value "CERTIFIED"
 
  Scenario: Test InterfaceOperation CREATE
   #Create Operations
@@ -46,12 +48,12 @@
   When I want to list Operations
 
 #Checkin
-  When I want to checkin this VF
+  When I want to checkin this component
   Then I want to check property "lifecycleState" for value "NOT_CERTIFIED_CHECKIN"
 
-#Submit
-  Then I want to submit this VF
-  And I want to check property "lifecycleState" for value "READY_FOR_CERTIFICATION"
+#Certify
+  Then I want to certify this component
+  And I want to check property "lifecycleState" for value "CERTIFIED"
 
 
  Scenario: Test InterfaceOperation UPDATE
@@ -67,12 +69,12 @@
   Then I want to check property "uniqueId" exists
 
   #Checkin
-  When I want to checkin this VF
+  When I want to checkin this component
   Then I want to check property "lifecycleState" for value "NOT_CERTIFIED_CHECKIN"
 
-  #Submit
-  Then I want to submit this VF
-  And I want to check property "lifecycleState" for value "READY_FOR_CERTIFICATION"
+  #Certify
+  Then I want to certify this component
+  And I want to check property "lifecycleState" for value "CERTIFIED"
 
 
  Scenario: Test InterfaceOperation DELETE
@@ -88,9 +90,9 @@
   When I want to delete an Operation
 
   #Checkin
-  When I want to checkin this VF
+  When I want to checkin this component
   Then I want to check property "lifecycleState" for value "NOT_CERTIFIED_CHECKIN"
 
-  #Submit
-  Then I want to submit this VF
-  And I want to check property "lifecycleState" for value "READY_FOR_CERTIFICATION"
\ No newline at end of file
+  #certify
+  Then I want to certify this component
+  And I want to check property "lifecycleState" for value "CERTIFIED"
\ No newline at end of file
diff --git a/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature b/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature
new file mode 100644
index 0000000..1ad2377
--- /dev/null
+++ b/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature
@@ -0,0 +1,37 @@
+Feature: Interface Operation Feature
+
+ Background: Init
+  Given I want to create a Service
+
+ Scenario: Test InterfaceOperation CRUD
+   #Create Operations
+  When I want to create an Operation
+  Then I want to check property "uniqueId" exists
+  And  I want to create an Operation
+  Then I want to check property "uniqueId" exists
+  And  I want to create an Operation
+  Then I want to check property "uniqueId" exists
+  When I want to create an Operation with input output
+  Then I want to check property "uniqueId" exists
+
+   #List All Operations
+  When I want to list Operations
+
+   #Get Operation By OperationId
+  When I want to get an Operation by Id
+  Then I want to check property "uniqueId" exists
+
+   #Update Operation
+  When I want to update an Operation
+  Then I want to check property "uniqueId" exists
+
+   #Delete Operation
+  When I want to delete an Operation
+
+   #Checkin
+  When I want to checkin this component
+  Then I want to check property "lifecycleState" for value "NOT_CERTIFIED_CHECKIN"
+
+   #Submit
+  Then I want to submit this component
+  And I want to check property "lifecycleState" for value "READY_FOR_CERTIFICATION"