diff --git a/controller/northbound/server/auth_test.go b/controller/northbound/server/auth_test.go
index ba6487644fe11d68577783a293b11016ae4a325b..8681ca7cb016d73c9ffcb9859a36be747655229d 100644
--- a/controller/northbound/server/auth_test.go
+++ b/controller/northbound/server/auth_test.go
@@ -620,6 +620,7 @@ func TestAuth_UpdateRoles(t *testing.T) {
 }
 
 func TestAuth_DeletePermissionsForRole(t *testing.T) {
+	clearAndCreateAuthTestSetup()
 	type args struct {
 		ctx     context.Context
 		request *apb.DeletePermissionsForRoleRequest
diff --git a/controller/nucleus/memoryDeviceStore.go b/controller/nucleus/memoryDeviceStore.go
index 536bb6ea4502e5de931b31e3ae95a25c514dda62..9a04d7a5c1c3fa06648e1eddefe7c2156ce35dcd 100644
--- a/controller/nucleus/memoryDeviceStore.go
+++ b/controller/nucleus/memoryDeviceStore.go
@@ -49,8 +49,8 @@ func (t *MemoryDeviceStore) Add(item device.Device) error {
 // Update updates a existing device.
 func (t *MemoryDeviceStore) Update(item device.Device) error {
 	_, ok := t.Store[item.ID().String()]
-	if ok {
-		return nil
+	if !ok {
+		return errors.ErrCouldNotFind{StoreName: deviceStoreName}
 	}
 
 	var device device.LoadedDevice
diff --git a/controller/rbac/memoryRoleStore.go b/controller/rbac/memoryRoleStore.go
index e40dc60b79afde6cecb0a69e9586f140fe74fbd9..da0e023eb7ffb6c14bb1ec1a4211603aadde82d6 100644
--- a/controller/rbac/memoryRoleStore.go
+++ b/controller/rbac/memoryRoleStore.go
@@ -55,8 +55,8 @@ func (s *MemoryRoleStore) Delete(item rbac.Role) error {
 // Update updates an existing role.
 func (s *MemoryRoleStore) Update(item rbac.Role) error {
 	_, ok := s.Store[item.ID().String()]
-	if ok {
-		return nil
+	if !ok {
+		return errors.ErrCouldNotFind{StoreName: roleStoreName}
 	}
 
 	var role rbac.LoadedRole
diff --git a/controller/rbac/memoryUserStore.go b/controller/rbac/memoryUserStore.go
index 338f56180fe137187b9c12a95530bf5a1caf5d46..c97439278b59716ee188f635c178e94eb8d6efd2 100644
--- a/controller/rbac/memoryUserStore.go
+++ b/controller/rbac/memoryUserStore.go
@@ -55,8 +55,8 @@ func (s *MemoryUserStore) Delete(item rbac.User) error {
 // Update updates an existing user.
 func (s *MemoryUserStore) Update(item rbac.User) error {
 	_, ok := s.Store[item.ID().String()]
-	if ok {
-		return nil
+	if !ok {
+		return errors.ErrCouldNotFind{StoreName: userStoreName}
 	}
 
 	var user rbac.LoadedUser