diff --git a/nucleus/cli-handling_test.go b/nucleus/cli-handling_test.go
index c5850e5ffa2b5fc237977affbba7ad18f308f942..6a5a49d394fb238c662d9458411c1d448328ddf4 100644
--- a/nucleus/cli-handling_test.go
+++ b/nucleus/cli-handling_test.go
@@ -3,7 +3,6 @@ package nucleus
 import (
 	pb "code.fbi.h-da.de/cocsn/gosdn/api/proto"
 	"context"
-	"github.com/google/uuid"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"reflect"
 	"testing"
@@ -57,7 +56,6 @@ func Test_server_AddDevice(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -78,7 +76,6 @@ func Test_server_AddDevice(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.AddDevice(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -97,7 +94,6 @@ func Test_server_BroadcastLog(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		log *pb.LogReply
@@ -115,7 +111,6 @@ func Test_server_BroadcastLog(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 		})
 	}
@@ -126,7 +121,6 @@ func Test_server_CreateLogStream(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		req    *emptypb.Empty
@@ -146,7 +140,6 @@ func Test_server_CreateLogStream(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			if err := s.CreateLogStream(tt.args.req, tt.args.stream); (err != nil) != tt.wantErr {
 				t.Errorf("CreateLogStream() error = %v, wantErr %v", err, tt.wantErr)
@@ -160,7 +153,6 @@ func Test_server_CreatePND(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -181,7 +173,6 @@ func Test_server_CreatePND(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.CreatePND(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -200,7 +191,6 @@ func Test_server_GetAllPNDs(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -221,7 +211,6 @@ func Test_server_GetAllPNDs(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.GetAllPNDs(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -240,7 +229,6 @@ func Test_server_GetAllSBINames(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -261,7 +249,6 @@ func Test_server_GetAllSBINames(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.GetAllSBINames(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -280,7 +267,6 @@ func Test_server_HandleDeviceGetRequest(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -301,7 +287,6 @@ func Test_server_HandleDeviceGetRequest(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.HandleDeviceGetRequest(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -320,7 +305,6 @@ func Test_server_SayHello(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -341,7 +325,6 @@ func Test_server_SayHello(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.SayHello(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -360,7 +343,6 @@ func Test_server_Shutdown(t *testing.T) {
 		UnimplementedGrpcCliServer pb.UnimplementedGrpcCliServer
 		core                       *Core
 		logConnections             []*logConnection
-		devices                    map[uuid.UUID]Device
 	}
 	type args struct {
 		ctx context.Context
@@ -381,7 +363,6 @@ func Test_server_Shutdown(t *testing.T) {
 				UnimplementedGrpcCliServer: tt.fields.UnimplementedGrpcCliServer,
 				core:                       tt.fields.core,
 				logConnections:             tt.fields.logConnections,
-				devices:                    tt.fields.devices,
 			}
 			got, err := s.Shutdown(tt.args.ctx, tt.args.in)
 			if (err != nil) != tt.wantErr {
@@ -393,4 +374,4 @@ func Test_server_Shutdown(t *testing.T) {
 			}
 		})
 	}
-}
+}
\ No newline at end of file