diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go
index 4839875b0adfb1055d7bfede4ee07b6cfd4eeda9..a292d57ad5cd3f3284b95dc7dd163b87632dfb62 100644
--- a/controller/api/initialise_test.go
+++ b/controller/api/initialise_test.go
@@ -47,8 +47,6 @@ import (
 	pb "google.golang.org/protobuf/proto"
 )
 
-// TODO(PND): fix tests "json: unsupported value: encountered a cycle via []*mock.Call", probably because of pndService interface missing change stuff?!
-
 /*
 Based on this StackOverflow answer: https://stackoverflow.com/a/52080545/4378176
 */
@@ -196,8 +194,6 @@ func bootstrapUnitTest() {
 	networkElementStore := nucleus.NewNetworkElementStore()
 	networkElementService := nucleus.NewNetworkElementService(networkElementStore, pluginService, eventService)
 
-	//TODO(PND): check/fix api_test: getdevice/adddevice, maybe the mne here is not necessary!
-
 	mne, _ := nucleus.NewNetworkElement("test", mneUUID, &tpb.TransportOption{
 		Address:  "test",
 		Username: "test",
diff --git a/controller/northbound/server/networkElement_test.go b/controller/northbound/server/networkElement_test.go
index 0782d5bef584ccb807f1fa6286181c9b1a0d282f..85b531ccf58ed77894067362939e3a3f004e8156 100644
--- a/controller/northbound/server/networkElement_test.go
+++ b/controller/northbound/server/networkElement_test.go
@@ -131,7 +131,6 @@ package server
 // 	}
 // }
 
-// // TODO(PND): fix test, problem here is either missing port in transport address or unreachable when address:port is provided.
 // // Somehow, provided mock transport does not get used?
 // func TestNetworkElementServer_getPath(t *testing.T) {
 // 	mneServer := &NetworkElementServer{}
@@ -357,8 +356,6 @@ package server
 // 	}
 // }
 
-// // TODO(PND): Need to fix test. Probably same problem as in GetPath Test.
-// // error: code = Unavailable desc = connection error: desc = "transport: Error while dialing dial tcp: missing address"
 // func TestNetworkElementServer_Update(t *testing.T) {
 // 	mneServer := &NetworkElementServer{}
 // 	createTestNetworkElementServer(t, mneServer)
diff --git a/controller/northbound/server/pnd_test.go b/controller/northbound/server/pnd_test.go
index 5350dbfb568a19a3f007c9965dcc1d2438965400..ad745861c33f75121472357b70d6212594f3ebf3 100644
--- a/controller/northbound/server/pnd_test.go
+++ b/controller/northbound/server/pnd_test.go
@@ -16,7 +16,6 @@ package server
 // 	"github.com/stretchr/testify/mock"
 // )
 
-// // TODO(PND): this whole file needs to be reworked!
 // func getTestPndServer(t *testing.T) *PndServer {
 // 	var err error
 // 	pndUUID, err = uuid.Parse(pndID)
diff --git a/controller/test/integration/nucleusIntegration_test.go b/controller/test/integration/nucleusIntegration_test.go
index 6eb3056126f3f19dfeb37b189dc0d51699b4a991..8fdcb85f1813ca3303c4f6df09d7fe4d31e4b37d 100644
--- a/controller/test/integration/nucleusIntegration_test.go
+++ b/controller/test/integration/nucleusIntegration_test.go
@@ -162,7 +162,6 @@ package integration
 // 	}
 // }
 
-// // TODO(PND): test compilable for now, not working. Changes pnd to n within t.Run method
 // func TestGnmi_SetValidIntegration(t *testing.T) {
 // 	if testing.Short() {
 // 		t.Skip("skipping integration test")