diff --git a/builtin/providers/circonus/resource_circonus_check_cloudwatch_test.go b/builtin/providers/circonus/resource_circonus_check_cloudwatch_test.go
index e1734b471..b15a5e21c 100644
--- a/builtin/providers/circonus/resource_circonus_check_cloudwatch_test.go
+++ b/builtin/providers/circonus/resource_circonus_check_cloudwatch_test.go
@@ -23,31 +23,29 @@ func TestAccCirconusCheckCloudWatch_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "collector.#", "1"),
 					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "collector.2388330941.id", "/broker/1"),
 					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.#", "1"),
-					// resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.api_key", ""),
-					// resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.api_secret", ""),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.dimmensions.%", "1"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.dimmensions.DBInstanceIdentifier", "atlas-production"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.#", "17"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.990896688", "CPUUtilization"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.3895259375", "DatabaseConnections"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.1328149445", "DiskQueueDepth"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.4218650584", "FreeStorageSpace"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.1835248983", "FreeableMemory"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.2757008135", "MaximumUsedTransactionIDs"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.915415866", "NetworkReceiveThroughput"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.1852047735", "NetworkTransmitThroughput"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.3518416306", "ReadIOPS"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.114013313", "ReadLatency"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.1284099341", "ReadThroughput"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.4205329773", "SwapUsage"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.3550163941", "TransactionLogsDiskUsage"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.2231806695", "TransactionLogsGeneration"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.335777904", "WriteIOPS"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.3894876280", "WriteLatency"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.metric.1569904650", "WriteThroughput"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.namespace", "AWS/RDS"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.version", "2010-08-01"),
-					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.2270818665.url", "https://monitoring.us-east-1.amazonaws.com"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.dimmensions.%", "1"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.dimmensions.DBInstanceIdentifier", "atlas-production"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.#", "17"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.990896688", "CPUUtilization"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.3895259375", "DatabaseConnections"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.1328149445", "DiskQueueDepth"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.4218650584", "FreeStorageSpace"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.1835248983", "FreeableMemory"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.2757008135", "MaximumUsedTransactionIDs"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.915415866", "NetworkReceiveThroughput"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.1852047735", "NetworkTransmitThroughput"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.3518416306", "ReadIOPS"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.114013313", "ReadLatency"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.1284099341", "ReadThroughput"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.4205329773", "SwapUsage"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.3550163941", "TransactionLogsDiskUsage"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.2231806695", "TransactionLogsGeneration"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.335777904", "WriteIOPS"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.3894876280", "WriteLatency"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.metric.1569904650", "WriteThroughput"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.namespace", "AWS/RDS"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.version", "2010-08-01"),
+					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "cloudwatch.1637274235.url", "https://monitoring.us-east-1.amazonaws.com"),
 					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "name", checkName),
 					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "notes", "Collect all the things exposed"),
 					resource.TestCheckResourceAttr("circonus_check.rds_metrics", "period", "60s"),