diff --git a/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py b/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py
index 61896b27df..e0a32c45d0 100644
--- a/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py
+++ b/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py
@@ -1,4 +1,3 @@
-from re import search
 from unittest import mock
 
 import botocore
@@ -87,9 +86,9 @@ class Test_rds_instance_deletion_protection:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "deletion protection is not enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 deletion protection is not enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -133,9 +132,9 @@ class Test_rds_instance_deletion_protection:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "deletion protection is enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 deletion protection is enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -191,9 +190,9 @@ class Test_rds_instance_deletion_protection:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "deletion protection is not enabled at cluster",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 deletion protection is not enabled at cluster db-cluster-1 level."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -249,9 +248,9 @@ class Test_rds_instance_deletion_protection:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "deletion protection is enabled at cluster",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 deletion protection is enabled at cluster db-cluster-1 level."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
diff --git a/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py b/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py
index e5dcb73e7b..d13b6185b8 100644
--- a/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py
+++ b/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py
@@ -1,4 +1,3 @@
-from re import search
 from unittest import mock
 
 import botocore
@@ -88,9 +87,9 @@ class Test_rds_instance_enhanced_monitoring_enabled:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "does not have enhanced monitoring enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 does not have enhanced monitoring enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -134,9 +133,9 @@ class Test_rds_instance_enhanced_monitoring_enabled:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "has enhanced monitoring enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 has enhanced monitoring enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
diff --git a/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py b/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py
index 6b1d9f7778..d6abac7c78 100644
--- a/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py
+++ b/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py
@@ -1,4 +1,3 @@
-from re import search
 from unittest import mock
 
 import botocore
@@ -88,9 +87,9 @@ class Test_rds_instance_integration_cloudwatch_logs:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "does not have CloudWatch Logs enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 does not have CloudWatch Logs enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -134,9 +133,9 @@ class Test_rds_instance_integration_cloudwatch_logs:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "is shipping audit error to CloudWatch Logs",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 is shipping audit error to CloudWatch Logs."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
diff --git a/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py b/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py
index 46166c401a..12664a3fe0 100644
--- a/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py
+++ b/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py
@@ -1,4 +1,3 @@
-from re import search
 from unittest import mock
 
 import botocore
@@ -88,9 +87,9 @@ class Test_rds_instance_minor_version_upgrade_enabled:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "does not have minor version upgrade enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 does not have minor version upgrade enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -134,9 +133,9 @@ class Test_rds_instance_minor_version_upgrade_enabled:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "has minor version upgrade enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 has minor version upgrade enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
diff --git a/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py b/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py
index 8e4f2f0ec8..ca5718cea5 100644
--- a/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py
+++ b/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py
@@ -1,4 +1,3 @@
-from re import search
 from unittest import mock
 
 import botocore
@@ -88,9 +87,9 @@ class Test_rds_instance_multi_az:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "does not have multi-AZ enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 does not have multi-AZ enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -134,9 +133,9 @@ class Test_rds_instance_multi_az:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "has multi-AZ enabled",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 has multi-AZ enabled."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -211,9 +210,9 @@ class Test_rds_instance_multi_az:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "has multi-AZ enabled at cluster",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance test-instance has multi-AZ enabled at cluster test-cluster level."
                 )
                 assert result[0].resource_id == "test-instance"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -288,9 +287,9 @@ class Test_rds_instance_multi_az:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "does not have multi-AZ enabled at cluster",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance test-instance does not have multi-AZ enabled at cluster test-cluster level."
                 )
                 assert result[0].resource_id == "test-instance"
                 assert result[0].region == AWS_REGION_US_EAST_1
diff --git a/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py b/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py
index 99fa8b8185..57709f12be 100644
--- a/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py
+++ b/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py
@@ -87,6 +87,10 @@ class Test_rds_instance_storage_encrypted:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 is not encrypted."
+                )
                 assert search(
                     "is not encrypted",
                     result[0].status_extended,
@@ -133,9 +137,9 @@ class Test_rds_instance_storage_encrypted:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "is encrypted",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance db-master-1 is encrypted."
                 )
                 assert result[0].resource_id == "db-master-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
diff --git a/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py b/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py
index c7882bb259..a49827b2fb 100644
--- a/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py
+++ b/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py
@@ -1,4 +1,3 @@
-from re import search
 from unittest import mock
 
 import botocore
@@ -102,9 +101,9 @@ class Test_rds_snapshots_public_access:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "is not shared",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance Snapshot snapshot-1 is not shared."
                 )
                 assert result[0].resource_id == "snapshot-1"
 
@@ -147,9 +146,9 @@ class Test_rds_snapshots_public_access:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "is public",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Instance Snapshot snapshot-1 is public."
                 )
                 assert result[0].resource_id == "snapshot-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -197,9 +196,9 @@ class Test_rds_snapshots_public_access:
 
                 assert len(result) == 1
                 assert result[0].status == "PASS"
-                assert search(
-                    "is not shared",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Cluster Snapshot snapshot-1 is not shared."
                 )
                 assert result[0].resource_id == "snapshot-1"
                 assert result[0].region == AWS_REGION_US_EAST_1
@@ -248,9 +247,9 @@ class Test_rds_snapshots_public_access:
 
                 assert len(result) == 1
                 assert result[0].status == "FAIL"
-                assert search(
-                    "is public",
-                    result[0].status_extended,
+                assert (
+                    result[0].status_extended
+                    == "RDS Cluster Snapshot snapshot-1 is public."
                 )
                 assert result[0].resource_id == "snapshot-1"
                 assert result[0].region == AWS_REGION_US_EAST_1