diff --git a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_role_test.yaml b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_role_test.yaml
index ff1ba6c7646eb22abe9a2a85bbc5c063bb2cd376..77b266d74411a2160c315937ba917c153dadff75 100644
--- a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_role_test.yaml
+++ b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_role_test.yaml
@@ -26,9 +26,7 @@ suite: ElsterTransfer read rbac test
 release:
   name: elstertransfer
   namespace: test-namespace
-set: 
-  elsterTransferOperator:
-    namespace: etr-operator
+
 templates:
   - templates/ozgcloud_elstertransfer_operator_configmap_read_role.yaml
 tests:
@@ -36,6 +34,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: RoleBinding
@@ -50,6 +50,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: subjects
@@ -62,6 +64,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - equal:
           path: roleRef
@@ -75,6 +79,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: Role
@@ -89,6 +95,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: rules
@@ -109,3 +117,10 @@ tests:
       - hasDocuments:
           count: 0
         documentIndex: 0
+  - it: test elsterTransferOperator.namespace must be set message
+    set: 
+      userAuthentication:
+        enabled: true
+    asserts:
+      - failedTemplate:
+          errorMessage: elsterTransferOperator.namespace must be set
\ No newline at end of file
diff --git a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_write_role_test.yaml b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_write_role_test.yaml
index 2cf0c1aaa73b4fed38dca217a94ee8be72c8664f..1bfb37203750cbe105e1bbc77e408ccd61fb4dbc 100644
--- a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_write_role_test.yaml
+++ b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_write_role_test.yaml
@@ -27,8 +27,6 @@ release:
   name: elstertransfer
   namespace: test-namespace
 set: 
-  elsterTransferOperator:
-    namespace: etr-operator
 templates:
   - templates/ozgcloud_elstertransfer_operator_configmap_write_role.yaml
 tests:
@@ -36,6 +34,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: RoleBinding
@@ -50,6 +50,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: subjects
@@ -62,6 +64,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - equal:
           path: roleRef
@@ -75,6 +79,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: Role
@@ -89,6 +95,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: rules
@@ -109,4 +117,11 @@ tests:
         documentIndex: 1
       - hasDocuments:
           count: 0
-        documentIndex: 0
\ No newline at end of file
+        documentIndex: 0
+  - it: test elsterTransferOperator.namespace must be set message
+    set: 
+      userAuthentication:
+        enabled: true
+    asserts:
+      - failedTemplate:
+          errorMessage: elsterTransferOperator.namespace must be set
\ No newline at end of file
diff --git a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_read_role_test.yaml b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_read_role_test.yaml
index 220c78a3c02761a3a5e9de7dc3b2358e82bea21a..06b4a6b87569917f910d55f1dac0f99ae465b5f5 100644
--- a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_read_role_test.yaml
+++ b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_read_role_test.yaml
@@ -25,10 +25,8 @@
 suite: ElsterTransfer write rbac test
 release:
   name: elstertransfer
-  namespace: test-namespace
-set: 
-  elsterTransferOperator:
-    namespace: etr-operator
+  namespace: test-namespace 
+  
 templates:
   - templates/ozgcloud_elstertransfer_operator_deployment_read_role.yaml
 tests:
@@ -36,6 +34,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: RoleBinding
@@ -50,6 +50,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: subjects
@@ -62,6 +64,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - equal:
           path: roleRef
@@ -75,6 +79,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: Role
@@ -89,6 +95,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: rules
@@ -110,4 +118,12 @@ tests:
         documentIndex: 1
       - hasDocuments:
           count: 0
-        documentIndex: 0
\ No newline at end of file
+        documentIndex: 0
+
+  - it: test elsterTransferOperator.namespace must be set message
+    set: 
+      userAuthentication:
+        enabled: true
+    asserts:
+      - failedTemplate:
+          errorMessage: elsterTransferOperator.namespace must be set
\ No newline at end of file
diff --git a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_write_role_test.yaml b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_write_role_test.yaml
index 401dc0e3914af2d7583b71fa50fcafb6ab958053..d4637a075633456d3ef00644b7e7893f44c49e24 100644
--- a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_write_role_test.yaml
+++ b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_deployment_write_role_test.yaml
@@ -26,16 +26,16 @@ suite: ElsterTransfer write rbac test
 release:
   name: elstertransfer
   namespace: test-namespace
-set: 
-  elsterTransferOperator:
-    namespace: etr-operator
+
 templates:
   - templates/ozgcloud_elstertransfer_operator_deployment_write_role.yaml
 tests:
-  - it: test RoleBinding metadata
+  - it: test RoleBinding metadata 
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: RoleBinding
@@ -50,6 +50,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: subjects
@@ -62,6 +64,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - equal:
           path: roleRef
@@ -75,6 +79,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - isKind:
           of: Role
@@ -89,6 +95,8 @@ tests:
     set: 
       userAuthentication:
         enabled: true
+      elsterTransferOperator:
+        namespace: etr-operator
     asserts:
       - contains:
           path: rules
@@ -110,4 +118,12 @@ tests:
         documentIndex: 1
       - hasDocuments:
           count: 0
-        documentIndex: 0
\ No newline at end of file
+        documentIndex: 0
+
+  - it: test elsterTransferOperator.namespace must be set message
+    set: 
+      userAuthentication:
+        enabled: true
+    asserts:
+      - failedTemplate:
+          errorMessage: elsterTransferOperator.namespace must be set
\ No newline at end of file