diff --git a/source/index-management/index-management.rst b/source/index-management/index-management.rst
index b40c4994c5..1480380308 100644
--- a/source/index-management/index-management.rst
+++ b/source/index-management/index-management.rst
@@ -902,7 +902,7 @@ write concern are not relevant for the search index management commands.
 Consistency with Existing APIs
 ------------------------------
 
-Drivers SHOULD strive for a search index management API that is as consistent with their existing search index management API as much as possible.
+Drivers SHOULD strive for a search index management API that is as consistent with their existing index management API as much as possible.
 
 
 NamespaceNotFound Errors
diff --git a/source/index-management/tests/createSearchIndex.yml b/source/index-management/tests/createSearchIndex.yml
index 3f923edaed..6aa56f3bc4 100644
--- a/source/index-management/tests/createSearchIndex.yml
+++ b/source/index-management/tests/createSearchIndex.yml
@@ -28,8 +28,8 @@ tests:
         arguments:
           model: { definition: &definition { mappings: { dynamic: true } } }
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
@@ -48,8 +48,8 @@ tests:
         arguments: 
           model: { definition: &definition { mappings: { dynamic: true } } , name: 'test index' }
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
diff --git a/source/index-management/tests/createSearchIndexes.yml b/source/index-management/tests/createSearchIndexes.yml
index 877fc0fa01..54a6e84ccb 100644
--- a/source/index-management/tests/createSearchIndexes.yml
+++ b/source/index-management/tests/createSearchIndexes.yml
@@ -28,8 +28,8 @@ tests:
         arguments: 
           models: []
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
@@ -49,8 +49,8 @@ tests:
         arguments:
           models: [ { definition: &definition { mappings: { dynamic: true } } } ]
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
@@ -69,8 +69,8 @@ tests:
         arguments: 
           models: [ { definition: &definition { mappings: { dynamic: true } } , name: 'test index' } ]
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
diff --git a/source/index-management/tests/dropSearchIndex.yml b/source/index-management/tests/dropSearchIndex.yml
index bfd6159281..e384cf26c5 100644
--- a/source/index-management/tests/dropSearchIndex.yml
+++ b/source/index-management/tests/dropSearchIndex.yml
@@ -28,8 +28,8 @@ tests:
         arguments:
           name: &indexName 'test index'
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
diff --git a/source/index-management/tests/listSearchIndexes.yml b/source/index-management/tests/listSearchIndexes.yml
index c912eae83c..a50becdf1d 100644
--- a/source/index-management/tests/listSearchIndexes.yml
+++ b/source/index-management/tests/listSearchIndexes.yml
@@ -26,8 +26,8 @@ tests:
       - name: listSearchIndexes
         object: *collection0
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
@@ -46,8 +46,8 @@ tests:
         arguments: 
           name: &indexName "test index"
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
@@ -69,8 +69,8 @@ tests:
           aggregationOptions: 
             batchSize: 10
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents:
diff --git a/source/index-management/tests/updateSearchIndex.yml b/source/index-management/tests/updateSearchIndex.yml
index 03d248b3dc..bb18ab512e 100644
--- a/source/index-management/tests/updateSearchIndex.yml
+++ b/source/index-management/tests/updateSearchIndex.yml
@@ -29,8 +29,8 @@ tests:
           name: &indexName 'test index'
           definition: &definition {}
         expectError:
-          # Search indexes are only available on 7.0+ atlas clusters.  DRIVERS-2630 will add e2e testing 
-          # against an Atlas cluster and the expectError will be removed.
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
           isError: true
           errorContains: Search index commands are only supported with Atlas
     expectEvents: