diff --git a/nsxt/data_source_nsxt_transport_zone_test.go b/nsxt/data_source_nsxt_transport_zone_test.go
index e0eca1378..315369218 100644
--- a/nsxt/data_source_nsxt_transport_zone_test.go
+++ b/nsxt/data_source_nsxt_transport_zone_test.go
@@ -15,7 +15,12 @@ func TestAccDataSourceNsxtTransportZone_basic(t *testing.T) {
 	testResourceName := "data.nsxt_transport_zone.test"
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:  func() { testAccOnlyLocalManager(t); testAccTestDeprecated(t); testAccPreCheck(t) },
+		PreCheck: func() {
+			testAccOnlyLocalManager(t)
+			testAccTestDeprecated(t)
+			testAccPreCheck(t)
+			testAccNSXVersion(t, "4.0.0")
+		},
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
diff --git a/nsxt/resource_nsxt_logical_dhcp_server.go b/nsxt/resource_nsxt_logical_dhcp_server.go
index b8aec90bf..24082ed88 100644
--- a/nsxt/resource_nsxt_logical_dhcp_server.go
+++ b/nsxt/resource_nsxt_logical_dhcp_server.go
@@ -85,6 +85,7 @@ func getDhcpOptions121Schema() *schema.Schema {
 		Type:        schema.TypeList,
 		Description: "DHCP classless static routes",
 		Optional:    true,
+		Computed:    true,
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"network": {
diff --git a/nsxt/utils_test.go b/nsxt/utils_test.go
index 2dc0afed8..3e5fc7122 100644
--- a/nsxt/utils_test.go
+++ b/nsxt/utils_test.go
@@ -27,7 +27,8 @@ import (
 // Default names or prefixed of NSX backend existing objects used in the acceptance tests.
 // Those defaults can be overridden using environment parameters
 const tier0RouterDefaultName string = "PLR-1 LogicalRouterTier0"
-const edgeClusterDefaultName string = "edgecluster1"
+const edgeClusterDefaultName string = "EDGECLUSTER1"
+const computeCollectionDefaultName string = "Cluster-1"
 const vlanTransportZoneName string = "transportzone2"
 const overlayTransportZoneNamePrefix string = "1-transportzone"
 const macPoolDefaultName string = "DefaultMacPool"
@@ -117,7 +118,7 @@ func getEdgeClusterName() string {
 func getComputeCollectionName() string {
 	name := os.Getenv("NSXT_TEST_COMPUTE_COLLECTION")
 	if name == "" {
-		name = edgeClusterDefaultName
+		name = computeCollectionDefaultName
 	}
 	return name
 }