diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go
index b3f49a489d7234e7d2457ae0671404f77f3796e5..5522eaa8fb4a845b5be199d463f4a1cb5299e614 100644
--- a/controller/api/initialise_test.go
+++ b/controller/api/initialise_test.go
@@ -139,7 +139,7 @@ func bootstrapUnitTest() {
 	mockNetworkElement := &mocks.NetworkElement{}
 	mockNetworkElement.On("Plugin").Return(pluginMock)
 	mockNetworkElement.On("ID").Return(mneUUID)
-	mockNetworkElement.On("GetModel").Return(pluginMock.Model())
+	mockNetworkElement.On("GetModel").Return(pluginMock.Model(false))
 	mockNetworkElement.On("Name").Return("openconfig")
 	mockNetworkElement.On("GetPlugin").Return(pluginMock)
 	mockNetworkElement.On("TransportAddress").Return("127.0.0.1:6030")
diff --git a/controller/nucleus/principalNetworkDomain_test.go b/controller/nucleus/principalNetworkDomain_test.go
index 5c306014b08734a4654aaf1e0badb35792a2b12b..43dec06a7528a16f1e0e06e5ed3fc6dd8ce9ee54 100644
--- a/controller/nucleus/principalNetworkDomain_test.go
+++ b/controller/nucleus/principalNetworkDomain_test.go
@@ -566,7 +566,7 @@ func Test_pndImplementation_GetNetworkElement(t *testing.T) {
 		})
 		return
 	}
-	pluginModel, err := mPlugin.Model()
+	pluginModel, err := mPlugin.Model(false)
 	if err != nil {
 		t.Error(err)
 		return
@@ -632,7 +632,7 @@ func Test_pndImplementation_GetNetworkElementByName(t *testing.T) {
 		return
 	}
 	mockPlugin := mockPlugin(t)
-	pluginModel, err := mockPlugin.Model()
+	pluginModel, err := mockPlugin.Model(false)
 	if err != nil {
 		t.Error(err)
 		return
diff --git a/plugin-registry/main.go b/plugin-registry/main.go
index 64b0fc61845704de9b03e5424fca758498b4f90c..95d113f5a377b03d8677a27dec233c073915ab11 100644
--- a/plugin-registry/main.go
+++ b/plugin-registry/main.go
@@ -60,11 +60,11 @@ func registerPlugins() *PluginRegistry {
 			var id uuid.UUID
 			switch i {
 			case 0:
-				id = uuid.MustParse("f3b474c2-6482-4010-b0d8-679dff73153b")
+				id = uuid.MustParse("e2c358b3-6482-4010-b0d8-679dff73153b")
 			case 1:
 				id = uuid.MustParse("d1c269a2-6482-4010-b0d8-679dff73153b")
 			case 2:
-				id = uuid.MustParse("e2c358b3-6482-4010-b0d8-679dff73153b")
+				id = uuid.MustParse("f3b474c2-6482-4010-b0d8-679dff73153b")
 			default:
 				break
 			}