diff --git a/gen/definitions/vpc_keepalive.yaml b/gen/definitions/vpc_keepalive.yaml
index 6994fee2..9bf743dd 100644
--- a/gen/definitions/vpc_keepalive.yaml
+++ b/gen/definitions/vpc_keepalive.yaml
@@ -121,3 +121,6 @@ test_prerequisites:
   - dn: sys/vpc/inst/dom
     class_name: vpcDom
     dependencies: [1]
+    attributes:
+      - name: id
+        value: 100
diff --git a/gen/definitions/vpc_peerlink.yaml b/gen/definitions/vpc_peerlink.yaml
index 794f1f04..fe2d0a21 100644
--- a/gen/definitions/vpc_peerlink.yaml
+++ b/gen/definitions/vpc_peerlink.yaml
@@ -28,16 +28,24 @@ test_prerequisites:
   - dn: sys/vpc/inst/dom
     class_name: vpcDom
     dependencies: [1]
+    attributes:
+      - name: id
+        value: 100
   - dn: sys/vpc/inst/dom/keepalive
     class_name: vpcKeepalive
     dependencies: [2]
+    attributes:
+      - name: destIp
+        value: "192.168.1.1"
+      - name: srcIp
+        value: "192.168.1.2"
   - dn: sys/fm/lacp
     class_name: fmLacp
     no_delete: true
     attributes:
       - name: adminSt
         value: enabled
-  - dn: sys/intf/aggr-[123]
+  - dn: sys/intf/aggr-[po1]
     class_name: pcAggrIf
     dependencies: [4]
     attributes:
diff --git a/internal/provider/data_source_nxos_vpc_keepalive_test.go b/internal/provider/data_source_nxos_vpc_keepalive_test.go
index a028209a..09cf98fd 100644
--- a/internal/provider/data_source_nxos_vpc_keepalive_test.go
+++ b/internal/provider/data_source_nxos_vpc_keepalive_test.go
@@ -71,6 +71,9 @@ resource "nxos_rest" "PreReq1" {
 resource "nxos_rest" "PreReq2" {
   dn = "sys/vpc/inst/dom"
   class_name = "vpcDom"
+  content = {
+      id = "100"
+  }
   depends_on = [nxos_rest.PreReq1, ]
 }
 
diff --git a/internal/provider/data_source_nxos_vpc_peerlink_test.go b/internal/provider/data_source_nxos_vpc_peerlink_test.go
index bfa612be..aa8f1786 100644
--- a/internal/provider/data_source_nxos_vpc_peerlink_test.go
+++ b/internal/provider/data_source_nxos_vpc_peerlink_test.go
@@ -59,12 +59,19 @@ resource "nxos_rest" "PreReq1" {
 resource "nxos_rest" "PreReq2" {
   dn = "sys/vpc/inst/dom"
   class_name = "vpcDom"
+  content = {
+      id = "100"
+  }
   depends_on = [nxos_rest.PreReq1, ]
 }
 
 resource "nxos_rest" "PreReq3" {
   dn = "sys/vpc/inst/dom/keepalive"
   class_name = "vpcKeepalive"
+  content = {
+      destIp = "192.168.1.1"
+      srcIp = "192.168.1.2"
+  }
   depends_on = [nxos_rest.PreReq2, ]
 }
 
@@ -78,7 +85,7 @@ resource "nxos_rest" "PreReq4" {
 }
 
 resource "nxos_rest" "PreReq5" {
-  dn = "sys/intf/aggr-[123]"
+  dn = "sys/intf/aggr-[po1]"
   class_name = "pcAggrIf"
   content = {
       id = "po1"
diff --git a/internal/provider/resource_nxos_vpc_keepalive_test.go b/internal/provider/resource_nxos_vpc_keepalive_test.go
index 4b0693a5..9fade116 100644
--- a/internal/provider/resource_nxos_vpc_keepalive_test.go
+++ b/internal/provider/resource_nxos_vpc_keepalive_test.go
@@ -76,6 +76,9 @@ resource "nxos_rest" "PreReq1" {
 resource "nxos_rest" "PreReq2" {
   dn = "sys/vpc/inst/dom"
   class_name = "vpcDom"
+  content = {
+      id = "100"
+  }
   depends_on = [nxos_rest.PreReq1, ]
 }
 
diff --git a/internal/provider/resource_nxos_vpc_peerlink_test.go b/internal/provider/resource_nxos_vpc_peerlink_test.go
index ca289879..bd8d3f92 100644
--- a/internal/provider/resource_nxos_vpc_peerlink_test.go
+++ b/internal/provider/resource_nxos_vpc_peerlink_test.go
@@ -64,12 +64,19 @@ resource "nxos_rest" "PreReq1" {
 resource "nxos_rest" "PreReq2" {
   dn = "sys/vpc/inst/dom"
   class_name = "vpcDom"
+  content = {
+      id = "100"
+  }
   depends_on = [nxos_rest.PreReq1, ]
 }
 
 resource "nxos_rest" "PreReq3" {
   dn = "sys/vpc/inst/dom/keepalive"
   class_name = "vpcKeepalive"
+  content = {
+      destIp = "192.168.1.1"
+      srcIp = "192.168.1.2"
+  }
   depends_on = [nxos_rest.PreReq2, ]
 }
 
@@ -83,7 +90,7 @@ resource "nxos_rest" "PreReq4" {
 }
 
 resource "nxos_rest" "PreReq5" {
-  dn = "sys/intf/aggr-[123]"
+  dn = "sys/intf/aggr-[po1]"
   class_name = "pcAggrIf"
   content = {
       id = "po1"