diff --git a/xos/tosca/tests/servicetest.py b/xos/tosca/tests/servicetest.py
index 291bb99..e493461 100644
--- a/xos/tosca/tests/servicetest.py
+++ b/xos/tosca/tests/servicetest.py
@@ -4,7 +4,9 @@
 
 class ServiceTest(BaseToscaTest):
     tests = ["create_service_minimal",
-             "create_service_notpublished"]
+             "create_service_notpublished",
+             "create_service_notenabled",
+             "create_service_public_key"]
 
     def cleanup(self):
         self.try_to_delete(Service, name="test_svc")
@@ -19,6 +21,16 @@
         self.execute(self.make_nodetemplate("test_svc", "tosca.nodes.Service", {"published": False}))
         self.assert_obj(Service, "test_svc", kind="generic", published=False, enabled=True)
 
+    def create_service_notenabled(self):
+        self.assert_noobj(Service, "test_svc")
+        self.execute(self.make_nodetemplate("test_svc", "tosca.nodes.Service", {"enabled": False}))
+        self.assert_obj(Service, "test_svc", kind="generic", published=True, enabled=False)
+
+    def create_service_public_key(self):
+        self.assert_noobj(Service, "test_svc")
+        self.execute(self.make_nodetemplate("test_svc", "tosca.nodes.Service", {"public_key": "foobar"}))
+        self.assert_obj(Service, "test_svc", kind="generic", published=True, enabled=True, public_key="foobar")
+
 if __name__ == "__main__":
     ServiceTest()