diff --git a/gen/templates/feature_templates/resource_test.go b/gen/templates/feature_templates/resource_test.go
index 9b3aaaec..b30f8889 100644
--- a/gen/templates/feature_templates/resource_test.go
+++ b/gen/templates/feature_templates/resource_test.go
@@ -38,7 +38,7 @@ func TestAccSdwan{{camelCase .Name}}FeatureTemplate(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					{{- $name := .Name }}
 					{{- range  .Attributes}}
-					{{- if and (.Mandatory) (ne .Type "StringList")}}
+					{{- if and (.Mandatory) (ne .Type "StringList") (ne .Type "Int64List")}}
 					resource.TestCheckResourceAttr("sdwan_{{snakeCase $name}}_feature_template.test", "{{.TfName}}", "{{.Example}}"),
 					{{- end}}
 					{{- end}}
@@ -61,21 +61,21 @@ func TestAccSdwan{{camelCase .Name}}FeatureTemplate(t *testing.T) {
 					{{- if eq .Type "List"}}
 					{{- $cclist := .TfName }}
 					{{- range  .Attributes}}
-					{{- if and (not .WriteOnly) (not .ExcludeTest) (ne .Type "StringList")}}
+					{{- if and (not .WriteOnly) (not .ExcludeTest) (ne .Type "StringList") (ne .Type "Int64List")}}
 					resource.TestCheckResourceAttr("sdwan_{{snakeCase $name}}_feature_template.test", "{{$list}}.0.{{$clist}}.0.{{$cclist}}.0.{{.TfName}}", "{{.Example}}"),
 					{{- end}}
 					{{- end}}
-					{{- else if ne .Type "StringList"}}
+					{{- else if and (ne .Type "StringList") (ne .Type "Int64List")}}
 					resource.TestCheckResourceAttr("sdwan_{{snakeCase $name}}_feature_template.test", "{{$list}}.0.{{$clist}}.0.{{.TfName}}", "{{.Example}}"),
 					{{- end}}
 					{{- end}}
 					{{- end}}
-					{{- else if ne .Type "StringList"}}
+					{{- else if and (ne .Type "StringList") (ne .Type "Int64List")}}
 					resource.TestCheckResourceAttr("sdwan_{{snakeCase $name}}_feature_template.test", "{{$list}}.0.{{.TfName}}", "{{.Example}}"),
 					{{- end}}
 					{{- end}}
 					{{- end}}
-					{{- else if ne .Type "StringList"}}
+					{{- else if and (ne .Type "StringList") (ne .Type "Int64List")}}
 					resource.TestCheckResourceAttr("sdwan_{{snakeCase $name}}_feature_template.test", "{{.TfName}}", "{{.Example}}"),
 					{{- end}}
 					{{- end}}
diff --git a/internal/provider/resource_sdwan_cisco_ntp_feature_template_test.go b/internal/provider/resource_sdwan_cisco_ntp_feature_template_test.go
index 7c7351da..e2469d34 100644
--- a/internal/provider/resource_sdwan_cisco_ntp_feature_template_test.go
+++ b/internal/provider/resource_sdwan_cisco_ntp_feature_template_test.go
@@ -40,7 +40,6 @@ func TestAccSdwanCiscoNTPFeatureTemplate(t *testing.T) {
 					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "master", "true"),
 					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "master_stratum", "6"),
 					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "master_source_interface", "e1"),
-					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "trusted_keys", "[1]"),
 					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "authentication_keys.0.id", "1"),
 					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "authentication_keys.0.value", "12345"),
 					resource.TestCheckResourceAttr("sdwan_cisco_ntp_feature_template.test", "servers.0.hostname_ip", "NTP_SERVER1"),
diff --git a/internal/provider/resource_sdwan_cisco_system_feature_template_test.go b/internal/provider/resource_sdwan_cisco_system_feature_template_test.go
index 9b9086b7..a38b5d19 100644
--- a/internal/provider/resource_sdwan_cisco_system_feature_template_test.go
+++ b/internal/provider/resource_sdwan_cisco_system_feature_template_test.go
@@ -53,7 +53,6 @@ func TestAccSdwanCiscoSystemFeatureTemplate(t *testing.T) {
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "geo_fencing_range", "1000"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "geo_fencing_sms", "true"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "geo_fencing_sms_phone_numbers.0.number", "+1234567"),
-					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "controller_group_list", "[1]"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "system_ip", "5.5.5.5"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "overlay_id", "1"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "site_id", "1"),
@@ -91,7 +90,6 @@ func TestAccSdwanCiscoSystemFeatureTemplate(t *testing.T) {
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "on_demand_tunnel", "true"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "on_demand_tunnel_idle_timeout", "10"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "affinity_group_number", "5"),
-					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "affinity_group_preference", "[1]"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "transport_gateway", "true"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "enable_mrf_migration", "enabled"),
 					resource.TestCheckResourceAttr("sdwan_cisco_system_feature_template.test", "migration_bgp_community", "100"),
diff --git a/internal/provider/resource_sdwan_cisco_vpn_interface_feature_template_test.go b/internal/provider/resource_sdwan_cisco_vpn_interface_feature_template_test.go
index 6a637739..c706dfae 100644
--- a/internal/provider/resource_sdwan_cisco_vpn_interface_feature_template_test.go
+++ b/internal/provider/resource_sdwan_cisco_vpn_interface_feature_template_test.go
@@ -90,12 +90,10 @@ func TestAccSdwanCiscoVPNInterfaceFeatureTemplate(t *testing.T) {
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_border", "false"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_qos_mode", "spoke"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_bandwidth", "50"),
-					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_groups", "[5]"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_color", "gold"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_max_control_connections", "10"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_control_connections", "false"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_vbond_as_stun_server", "false"),
-					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_exclude_controller_group_list", "[10]"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_vmanage_connection_preference", "5"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_port_hop", "false"),
 					resource.TestCheckResourceAttr("sdwan_cisco_vpn_interface_feature_template.test", "tunnel_interface_color_restrict", "false"),