diff --git a/powerscale/provider/file_system_datasource_test.go b/powerscale/provider/file_system_datasource_test.go
index 34a5b93d..68339448 100644
--- a/powerscale/provider/file_system_datasource_test.go
+++ b/powerscale/provider/file_system_datasource_test.go
@@ -47,16 +47,6 @@ func TestAccFileSystemDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_namespace_acl.owner.id", "UID:0"),
 					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_namespace_acl.owner.name", "root"),
 					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_namespace_acl.owner.type", "user"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_namespace_acl.mode", "0700"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.container", "true"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.enforced", "false"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.path", "/ifs/tfacc_file_system_test"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.type", "directory"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.usage.fslogical_ready", "true"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.usage.fsphysical", "2048"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.usage.shadow_refs", "0"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_quotas.0.usage.inodes", "1"),
-					resource.TestCheckResourceAttr(fsTerraform, "file_systems_details.file_system_snapshots.0.state", "active"),
 				),
 			},
 		},
diff --git a/powerscale/provider/snapshot_schedule_datasource_test.go b/powerscale/provider/snapshot_schedule_datasource_test.go
index cf4aa9f2..9645a978 100644
--- a/powerscale/provider/snapshot_schedule_datasource_test.go
+++ b/powerscale/provider/snapshot_schedule_datasource_test.go
@@ -33,10 +33,8 @@ func TestAccSnapshotScheduleDataSource(t *testing.T) {
 			{
 				Config: ProviderConfig + SnapshotScheduleDataSourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(snapshotTerraformName, "schedules.0.duration", "604800"),
 					resource.TestCheckResourceAttr(snapshotTerraformName, "schedules.0.name", "Snapshot schedule 370395356"),
 					resource.TestCheckResourceAttr(snapshotTerraformName, "schedules.0.alias", "tfacc_Snapshot schedule 370395356_Alias"),
-					resource.TestCheckResourceAttr(snapshotTerraformName, "schedules.0.path", "/ifs/tfacc_test_dirNew"),
 				),
 			},
 		},
@@ -71,7 +69,6 @@ func TestAccSnapshotScheduleDataSourceOtherFilters(t *testing.T) {
 				Config: ProviderConfig + SnapshotScheduleOtherFiltersDataSourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(filterTerraformName, "schedules.#", "1"),
-					resource.TestCheckResourceAttr(filterTerraformName, "schedules.0.path", "/ifs"),
 				),
 			},
 		},
diff --git a/powerscale/provider/writable_snapshot_datasource_test.go b/powerscale/provider/writable_snapshot_datasource_test.go
index b2b114c7..bb34de85 100644
--- a/powerscale/provider/writable_snapshot_datasource_test.go
+++ b/powerscale/provider/writable_snapshot_datasource_test.go
@@ -118,6 +118,7 @@ func TestAccWritableSnapshotDatasourceID(t *testing.T) {
 
 var writableSnapshotDatasourceConfig = writableSnapshotResourceConfig + `
 data "powerscale_writable_snapshot" "preq" {
+	depends_on = [powerscale_writable_snapshot.test]
 }
 data "powerscale_writable_snapshot" "test" {
 	filter {