diff --git a/consumer/nf_management.go b/consumer/nf_management.go
index fe4913f..bcea049 100644
--- a/consumer/nf_management.go
+++ b/consumer/nf_management.go
@@ -38,7 +38,7 @@ func BuildNFProfile(context *nssf_context.NSSFContext) (profile models.NfProfile
 	if len(services) > 0 {
 		profile.NfServices = &services
 	}
-	return
+	return profile, err
 }
 
 var SendRegisterNFInstance = func(nrfUri, nfInstanceId string, profile models.NfProfile) (
diff --git a/consumer/nf_management_test.go b/consumer/nf_management_test.go
new file mode 100644
index 0000000..b4db346
--- /dev/null
+++ b/consumer/nf_management_test.go
@@ -0,0 +1,56 @@
+// Copyright 2024 Canonical Ltd.
+//
+// SPDX-License-Identifier: Apache-2.0
+package consumer_test
+
+import (
+	"testing"
+
+	"github.com/omec-project/nssf/consumer"
+	"github.com/omec-project/nssf/context"
+	"github.com/omec-project/openapi/models"
+)
+
+func TestBuildNFProfile_EmptyContext(t *testing.T) {
+	ctx := context.NSSFContext{NfId: "test-id"}
+
+	profile, err := consumer.BuildNFProfile(&ctx)
+
+	if err != nil {
+		t.Errorf("Error building NFProfile: %v\n", err)
+	}
+
+	if profile.NfInstanceId != "test-id" ||
+		profile.NfType != models.NfType_NSSF ||
+		profile.NfStatus != models.NfStatus_REGISTERED ||
+		len(*profile.PlmnList) != 0 ||
+		profile.Ipv4Addresses[0] != ctx.RegisterIPv4 ||
+		profile.NfServices != nil {
+		t.Errorf("Unexpected NfProfile built: %v\n", profile)
+	}
+}
+
+func TestBuildNFProfile_InitializedContext(t *testing.T) {
+	ctx := context.NSSFContext{NfId: "test-id",
+		SupportedPlmnList: []models.PlmnId{{Mcc: "200", Mnc: "99"}},
+		RegisterIPv4:      "127.0.0.42",
+		NfService: map[models.ServiceName]models.NfService{models.ServiceName_NNSSF_NSSELECTION: {ServiceInstanceId: "instance-id",
+			ServiceName: "service-name"}},
+	}
+
+	profile, err := consumer.BuildNFProfile(&ctx)
+
+	if err != nil {
+		t.Errorf("Error building NFProfile: %v\n", err)
+	}
+
+	if profile.NfInstanceId != "test-id" ||
+		profile.NfType != models.NfType_NSSF ||
+		profile.NfStatus != models.NfStatus_REGISTERED ||
+		(*profile.PlmnList)[0].Mcc != "200" ||
+		(*profile.PlmnList)[0].Mnc != "99" ||
+		profile.Ipv4Addresses[0] != ctx.RegisterIPv4 ||
+		(*profile.NfServices)[0].ServiceName != "service-name" {
+		t.Errorf("Unexpected NfProfile built: %v\n", profile)
+	}
+}