diff --git a/examples/src/test/kotlin/AggExpressionsTest.kt b/examples/src/test/kotlin/AggExpressionsTest.kt
index 9687f4b3..b57c1936 100644
--- a/examples/src/test/kotlin/AggExpressionsTest.kt
+++ b/examples/src/test/kotlin/AggExpressionsTest.kt
@@ -3,7 +3,11 @@ import com.mongodb.client.model.Aggregates
 import com.mongodb.client.model.Field
 import com.mongodb.client.model.Filters
 import com.mongodb.client.model.Projections
-import com.mongodb.client.model.mql.*
+import com.mongodb.client.model.mql.MqlArray
+import com.mongodb.client.model.mql.MqlDocument
+import com.mongodb.client.model.mql.MqlInteger
+import com.mongodb.client.model.mql.MqlNumber
+import com.mongodb.client.model.mql.MqlString
 import com.mongodb.client.model.mql.MqlValues.current
 import com.mongodb.client.model.mql.MqlValues.of
 import com.mongodb.kotlin.client.coroutine.MongoClient
diff --git a/examples/src/test/kotlin/AggregatesBuilderTest.kt b/examples/src/test/kotlin/AggregatesBuilderTest.kt
index efc86831..85f29196 100644
--- a/examples/src/test/kotlin/AggregatesBuilderTest.kt
+++ b/examples/src/test/kotlin/AggregatesBuilderTest.kt
@@ -1,9 +1,24 @@
 
 import com.mongodb.MongoNamespace
-import com.mongodb.client.model.*
-import com.mongodb.client.model.Accumulators.*
-import com.mongodb.client.model.Aggregates.*
-import com.mongodb.client.model.Sorts.ascending
+import com.mongodb.client.model.Accumulators
+import com.mongodb.client.model.Aggregates
+import com.mongodb.client.model.BucketAutoOptions
+import com.mongodb.client.model.BucketGranularity
+import com.mongodb.client.model.BucketOptions
+import com.mongodb.client.model.Facet
+import com.mongodb.client.model.Field
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.GraphLookupOptions
+import com.mongodb.client.model.IndexOptions
+import com.mongodb.client.model.Indexes
+import com.mongodb.client.model.MergeOptions
+import com.mongodb.client.model.MongoTimeUnit
+import com.mongodb.client.model.Projections
+import com.mongodb.client.model.Sorts
+import com.mongodb.client.model.UnwindOptions
+import com.mongodb.client.model.Variable
+import com.mongodb.client.model.WindowOutputFields
+import com.mongodb.client.model.Windows
 import com.mongodb.client.model.densify.DensifyOptions
 import com.mongodb.client.model.densify.DensifyRange
 import com.mongodb.client.model.fill.FillOptions
@@ -21,7 +36,10 @@ import kotlinx.coroutines.runBlocking
 import org.bson.Document
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.types.ObjectId
-import org.junit.jupiter.api.*
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
 import java.time.LocalDateTime
 import kotlin.test.Ignore
 import kotlin.test.assertEquals
@@ -116,8 +134,8 @@ class AggregatesBuilderTest {
         val collection = database.getCollection<Document>("someCollection")
         collection.insertOne(Document("someField", "someCriteria"))
         // :snippet-start: methods-example
-        val matchStage = match(Filters.eq("someField", "someCriteria"))
-        val sortByCountStage = sortByCount("\$someField")
+        val matchStage = Aggregates.match(Filters.eq("someField", "someCriteria"))
+        val sortByCountStage = Aggregates.sortByCount("\$someField")
         val results = collection.aggregate(
             listOf(matchStage, sortByCountStage)).toList()
         // :snippet-end:
@@ -338,8 +356,8 @@ class AggregatesBuilderTest {
         val grouping = orderCollection.aggregate<Results>(listOf(
             // :snippet-start: group
             Aggregates.group("\$${Order::customerId.name}",
-                sum("totalQuantity", "\$${Order::ordered.name}"),
-                avg("averageQuantity", "\$${Order::ordered.name}")
+                Accumulators.sum("totalQuantity", "\$${Order::ordered.name}"),
+                Accumulators.avg("averageQuantity", "\$${Order::ordered.name}")
             )
             // :snippet-end:
         ))
@@ -673,7 +691,7 @@ class AggregatesBuilderTest {
 
         val resultsFlow = translateCollection.aggregate<Results>(listOf(
             // :snippet-start: replace-root
-            replaceRoot("\$${Book::spanishTranslation.name}")
+            Aggregates.replaceRoot("\$${Book::spanishTranslation.name}")
             //  :snippet-end:
 
         ))
@@ -686,7 +704,7 @@ class AggregatesBuilderTest {
         data class Results (val watched: Boolean, val type: String)
         val resultsFlow = movieCollection.aggregate<Results>(listOf(
             // :snippet-start: add-fields
-            addFields(
+            Aggregates.addFields(
                 Field("watched", false),
                 Field("type", "movie")
             )
@@ -711,7 +729,7 @@ class AggregatesBuilderTest {
     fun bucketTest() = runBlocking {
         val resultsFlow = screenCollection.aggregate<Document>(listOf(
             // :snippet-start: bucket
-            bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70, 1000))
+            Aggregates.bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70, 1000))
             // :snippet-end:
         ))
         assertEquals(4, resultsFlow.toList().size)
@@ -722,12 +740,12 @@ class AggregatesBuilderTest {
         data class Results(val count: Int, val matches: List<Int>)
         val resultsFlow = screenCollection.aggregate<Results>(listOf(
             // :snippet-start: bucket-options
-            bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70),
+            Aggregates.bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70),
                 BucketOptions()
                     .defaultBucket("monster")
                     .output(
-                        sum("count", 1),
-                        push("matches", "\$${Screen::screenSize.name}")
+                        Accumulators.sum("count", 1),
+                        Accumulators.push("matches", "\$${Screen::screenSize.name}")
                     )
             )
             // :snippet-end:
@@ -741,7 +759,7 @@ class AggregatesBuilderTest {
         data class Results(@BsonId val id: MinMax, val count: Int)
         val resultsFlow = screenCollection.aggregate<Results>(listOf(
             // :snippet-start: bucket-auto
-            bucketAuto("\$${Screen::screenSize.name}", 5)
+            Aggregates.bucketAuto("\$${Screen::screenSize.name}", 5)
             // :snippet-end:
         ))
         assertEquals(5, resultsFlow.toList().size)
@@ -755,11 +773,11 @@ class AggregatesBuilderTest {
         // example kotlin nested data classes
         val resultsFlow = screenCollection.aggregate<Results>(listOf(
             // :snippet-start: bucket-auto-options
-            bucketAuto(
+            Aggregates.bucketAuto(
                 "\$${Screen::price.name}", 5,
                 BucketAutoOptions()
                     .granularity(BucketGranularity.POWERSOF2)
-                    .output(sum("count", 1), avg("avgPrice", "\$${Screen::price.name}"))
+                    .output(Accumulators.sum("count", 1), Accumulators.avg("avgPrice", "\$${Screen::price.name}"))
                     )
             // :snippet-end:
         ))
@@ -774,19 +792,19 @@ class AggregatesBuilderTest {
         data class Results(val `Screen Sizes`: List<ScreenSize>)
         val resultsFlow = screenCollection.aggregate<Results>(listOf(
             // :snippet-start: facet
-            facet(
+            Aggregates.facet(
                 Facet(
                     "Screen Sizes",
-                    bucketAuto(
+                    Aggregates.bucketAuto(
                         "\$${Screen::screenSize.name}",
                         5,
-                        BucketAutoOptions().output(sum("count", 1))
+                        BucketAutoOptions().output(Accumulators.sum("count", 1))
                     )
                 ),
                 Facet(
                     "Manufacturer",
-                    sortByCount("\$${Screen::manufacturer.name}"),
-                    limit(5)
+                    Aggregates.sortByCount("\$${Screen::manufacturer.name}"),
+                    Aggregates.limit(5)
                 )
             )
             // :snippet-end:
@@ -852,7 +870,7 @@ class AggregatesBuilderTest {
         val resultsFlow = weatherCollection.aggregate<Weather>(
             listOf(
                 Aggregates.fill(
-                    FillOptions.fillOptions().sortBy(ascending(Weather::hour.name)),
+                    FillOptions.fillOptions().sortBy(Sorts.ascending(Weather::hour.name)),
                     FillOutputField.value(Weather::temperature.name, "23.6C"),
                     FillOutputField.linear(Weather::air_pressure.name)
                 )
@@ -881,7 +899,7 @@ class AggregatesBuilderTest {
         weatherCollection.insertMany(weather)
         val resultsFlow = weatherCollection.aggregate<Document>(listOf(
             // :snippet-start: densify
-            densify(
+            Aggregates.densify(
                 "ts",
                 DensifyRange.partitionRangeWithStep(15, MongoTimeUnit.MINUTE),
                 DensifyOptions.densifyOptions().partitionByFields("Position.coordinates")
diff --git a/examples/src/test/kotlin/AuthTest.kt b/examples/src/test/kotlin/AuthTest.kt
index bd4285e5..70272c94 100644
--- a/examples/src/test/kotlin/AuthTest.kt
+++ b/examples/src/test/kotlin/AuthTest.kt
@@ -1,5 +1,10 @@
 
-import com.mongodb.*
+import com.mongodb.AwsCredential
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoCredential
+import com.mongodb.MongoException
+import com.mongodb.ServerAddress
 import com.mongodb.connection.ClusterSettings
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import io.github.cdimascio.dotenv.dotenv
@@ -7,7 +12,6 @@ import kotlinx.coroutines.runBlocking
 import org.bson.BsonInt64
 import org.bson.Document
 import org.junit.jupiter.api.TestInstance
-import java.util.*
 import java.util.function.Supplier
 import kotlin.test.Ignore
 
diff --git a/examples/src/test/kotlin/BuildersTest.kt b/examples/src/test/kotlin/BuildersTest.kt
index 6c632033..09dda723 100644
--- a/examples/src/test/kotlin/BuildersTest.kt
+++ b/examples/src/test/kotlin/BuildersTest.kt
@@ -1,7 +1,6 @@
 
-import com.mongodb.*
-import com.mongodb.client.model.Filters.*
-import com.mongodb.client.model.Projections.*
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.Projections
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.first
@@ -10,11 +9,10 @@ import org.bson.BsonObjectId
 import org.bson.Document
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class BuildersTest {
@@ -75,8 +73,8 @@ internal class BuildersTest {
         // :snippet-start: builders
         data class Results(val email: String)
 
-        val filter = and(eq(User::gender.name, "female"), gt(User::age.name, 29))
-        val projection = fields(excludeId(), include("email"))
+        val filter = Filters.and(Filters.eq(User::gender.name, "female"), Filters.gt(User::age.name, 29))
+        val projection = Projections.fields(Projections.excludeId(), Projections.include("email"))
         val results = collection.find<Results>(filter).projection(projection)
         // :snippet-end:
         assertEquals("foo@example.com", results.first().email)
diff --git a/examples/src/test/kotlin/BulkTest.kt b/examples/src/test/kotlin/BulkTest.kt
index 19d986eb..6211893a 100644
--- a/examples/src/test/kotlin/BulkTest.kt
+++ b/examples/src/test/kotlin/BulkTest.kt
@@ -1,17 +1,25 @@
 
 import com.mongodb.MongoBulkWriteException
-import com.mongodb.client.model.*
+import com.mongodb.client.model.BulkWriteOptions
+import com.mongodb.client.model.DeleteManyModel
+import com.mongodb.client.model.DeleteOneModel
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.InsertOneModel
+import com.mongodb.client.model.ReplaceOneModel
+import com.mongodb.client.model.UpdateOneModel
+import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 // :snippet-start: bulk-data-model
 data class Person(
diff --git a/examples/src/test/kotlin/ChangeStreamsTest.kt b/examples/src/test/kotlin/ChangeStreamsTest.kt
index 94f7b33f..7086f7c2 100644
--- a/examples/src/test/kotlin/ChangeStreamsTest.kt
+++ b/examples/src/test/kotlin/ChangeStreamsTest.kt
@@ -16,12 +16,12 @@ import kotlinx.coroutines.runBlocking
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
-
+import java.util.UUID
+import kotlin.test.assertEquals
+import kotlin.test.Ignore
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class ChangeStreamsTest {
diff --git a/examples/src/test/kotlin/ChangeTest.kt b/examples/src/test/kotlin/ChangeTest.kt
index cbb97f5e..4853f486 100644
--- a/examples/src/test/kotlin/ChangeTest.kt
+++ b/examples/src/test/kotlin/ChangeTest.kt
@@ -6,11 +6,10 @@ import config.getConfig
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class ChangeTest {
diff --git a/examples/src/test/kotlin/CodecTest.kt b/examples/src/test/kotlin/CodecTest.kt
index 39a8c678..b2009280 100644
--- a/examples/src/test/kotlin/CodecTest.kt
+++ b/examples/src/test/kotlin/CodecTest.kt
@@ -7,7 +7,11 @@ import kotlinx.coroutines.runBlocking
 import org.bson.BsonReader
 import org.bson.BsonType
 import org.bson.BsonWriter
-import org.bson.codecs.*
+import org.bson.codecs.BsonTypeClassMap
+import org.bson.codecs.Codec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.IntegerCodec
 import org.bson.codecs.configuration.CodecProvider
 import org.bson.codecs.configuration.CodecRegistries
 import org.bson.codecs.configuration.CodecRegistry
diff --git a/examples/src/test/kotlin/CollationsTest.kt b/examples/src/test/kotlin/CollationsTest.kt
index 610e67db..94750640 100644
--- a/examples/src/test/kotlin/CollationsTest.kt
+++ b/examples/src/test/kotlin/CollationsTest.kt
@@ -1,5 +1,20 @@
 
-import com.mongodb.client.model.*
+import com.mongodb.client.model.Accumulators
+import com.mongodb.client.model.Aggregates
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
+import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.FindOneAndDeleteOptions
+import com.mongodb.client.model.FindOneAndUpdateOptions
+import com.mongodb.client.model.IndexOptions
+import com.mongodb.client.model.Indexes
+import com.mongodb.client.model.ReturnDocument
+import com.mongodb.client.model.Sorts
+import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.first
diff --git a/examples/src/test/kotlin/CompoundTest.kt b/examples/src/test/kotlin/CompoundTest.kt
index cb7c16f3..d230f67a 100644
--- a/examples/src/test/kotlin/CompoundTest.kt
+++ b/examples/src/test/kotlin/CompoundTest.kt
@@ -1,19 +1,25 @@
 
-import com.mongodb.client.model.*
-import com.mongodb.client.model.Sorts.*
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.FindOneAndDeleteOptions
+import com.mongodb.client.model.FindOneAndReplaceOptions
+import com.mongodb.client.model.FindOneAndUpdateOptions
+import com.mongodb.client.model.ReturnDocument
+import com.mongodb.client.model.Sorts
+import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
-import org.junit.jupiter.api.*
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import java.util.*
+import org.junit.jupiter.api.TestInstance
 import java.util.concurrent.TimeUnit
-import kotlin.test.*
-
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class CompoundOperationsTest {
     // :snippet-start: compound-data-model
diff --git a/examples/src/test/kotlin/ConnectTest.kt b/examples/src/test/kotlin/ConnectTest.kt
index 1a7c6c04..d21f96f8 100644
--- a/examples/src/test/kotlin/ConnectTest.kt
+++ b/examples/src/test/kotlin/ConnectTest.kt
@@ -1,15 +1,19 @@
 
-import com.mongodb.*
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoException
+import com.mongodb.ServerAddress
+import com.mongodb.ServerApi
+import com.mongodb.ServerApiVersion
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.runBlocking
 import org.bson.BsonInt64
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 // :replace-start: {
 //    "terms": {
 //       "CONNECTION_URI_PLACEHOLDER": "\"<connection string>\""
diff --git a/examples/src/test/kotlin/CountTest.kt b/examples/src/test/kotlin/CountTest.kt
index f3d07f82..4dee3fac 100644
--- a/examples/src/test/kotlin/CountTest.kt
+++ b/examples/src/test/kotlin/CountTest.kt
@@ -1,16 +1,15 @@
 
-import com.mongodb.client.model.*
+import com.mongodb.client.model.CountOptions
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.runBlocking
 import org.bson.BsonDocument
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class CountTest {
diff --git a/examples/src/test/kotlin/DataClassTest.kt b/examples/src/test/kotlin/DataClassTest.kt
index 0436b22c..7a0738d2 100644
--- a/examples/src/test/kotlin/DataClassTest.kt
+++ b/examples/src/test/kotlin/DataClassTest.kt
@@ -15,11 +15,10 @@ import org.bson.codecs.pojo.annotations.BsonRepresentation
 import org.bson.types.ObjectId
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.time.LocalDate
-import java.util.*
-import kotlin.test.*
 
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
diff --git a/examples/src/test/kotlin/DatabaseCollectionsTest.kt b/examples/src/test/kotlin/DatabaseCollectionsTest.kt
index cceaac62..706be5a7 100644
--- a/examples/src/test/kotlin/DatabaseCollectionsTest.kt
+++ b/examples/src/test/kotlin/DatabaseCollectionsTest.kt
@@ -1,5 +1,10 @@
 
-import com.mongodb.client.model.*
+import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.FindOneAndUpdateOptions
+import com.mongodb.client.model.ReturnDocument
+import com.mongodb.client.model.Updates
+import com.mongodb.client.model.ValidationOptions
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.toList
@@ -7,10 +12,10 @@ import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.types.ObjectId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import kotlin.test.assertTrue
+import org.junit.jupiter.api.Assertions.assertTrue
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class DatabaseCollectionsTest {
@@ -126,6 +131,6 @@ internal class DatabaseCollectionsTest {
         // :snippet-end:
 
         // Junit test for the above code
-        Assertions.assertEquals(NewFruit(1,"strawberry", 205, listOf("summer", "fall")), result)
+        assertEquals(NewFruit(1,"strawberry", 205, listOf("summer", "fall")), result)
     }
 }
diff --git a/examples/src/test/kotlin/DeleteTest.kt b/examples/src/test/kotlin/DeleteTest.kt
index 0188ebd1..ab5fb9ef 100644
--- a/examples/src/test/kotlin/DeleteTest.kt
+++ b/examples/src/test/kotlin/DeleteTest.kt
@@ -7,11 +7,11 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class DeleteTest {
diff --git a/examples/src/test/kotlin/DocumentsTest.kt b/examples/src/test/kotlin/DocumentsTest.kt
index 8f1fe122..f4d68f0a 100644
--- a/examples/src/test/kotlin/DocumentsTest.kt
+++ b/examples/src/test/kotlin/DocumentsTest.kt
@@ -1,22 +1,27 @@
 
+import com.mongodb.assertions.Assertions.assertNotNull
 import com.mongodb.client.model.Filters
 import com.mongodb.client.result.InsertOneResult
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
-import org.bson.*
+import org.bson.BsonArray
+import org.bson.BsonDateTime
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonObjectId
+import org.bson.BsonString
+import org.bson.Document
 import org.bson.json.JsonObject
 import org.bson.types.ObjectId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
-import java.time.ZoneOffset
-import java.util.*
-import kotlin.test.*
 
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
diff --git a/examples/src/test/kotlin/EjsonTest.kt b/examples/src/test/kotlin/EjsonTest.kt
index a14b9f68..ed2a43a9 100644
--- a/examples/src/test/kotlin/EjsonTest.kt
+++ b/examples/src/test/kotlin/EjsonTest.kt
@@ -1,19 +1,20 @@
 
-import org.bson.*
+import org.bson.BsonTimestamp
+import org.bson.Document
 import org.bson.json.JsonMode
 import org.bson.json.JsonReader
 import org.bson.json.JsonWriter
 import org.bson.json.JsonWriterSettings
 import org.bson.types.ObjectId
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.io.BufferedWriter
 import java.io.OutputStreamWriter
-import java.time.*
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
-import java.util.*
-import kotlin.test.*
-
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class EjsonTest {
diff --git a/examples/src/test/kotlin/EmbeddedArraysTest.kt b/examples/src/test/kotlin/EmbeddedArraysTest.kt
index 6e7040ed..632e26d6 100644
--- a/examples/src/test/kotlin/EmbeddedArraysTest.kt
+++ b/examples/src/test/kotlin/EmbeddedArraysTest.kt
@@ -1,5 +1,8 @@
 
-import com.mongodb.client.model.*
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.FindOneAndUpdateOptions
+import com.mongodb.client.model.ReturnDocument
+import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.toList
@@ -7,11 +10,10 @@ import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class UpdateArraysTest {
diff --git a/examples/src/test/kotlin/EnterpriseAuthTest.kt b/examples/src/test/kotlin/EnterpriseAuthTest.kt
index d0385bc3..39dee4af 100644
--- a/examples/src/test/kotlin/EnterpriseAuthTest.kt
+++ b/examples/src/test/kotlin/EnterpriseAuthTest.kt
@@ -1,7 +1,10 @@
 
-import com.mongodb.*
+import com.mongodb.ConnectionString
+import com.mongodb.KerberosSubjectProvider
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoCredential
+import com.mongodb.ServerAddress
 import com.mongodb.kotlin.client.coroutine.MongoClient
-import io.github.cdimascio.dotenv.dotenv
 import kotlinx.coroutines.runBlocking
 import javax.security.auth.Subject
 import javax.security.auth.login.LoginContext
diff --git a/examples/src/test/kotlin/FlowTest.kt b/examples/src/test/kotlin/FlowTest.kt
index 96ab7649..f41e1075 100644
--- a/examples/src/test/kotlin/FlowTest.kt
+++ b/examples/src/test/kotlin/FlowTest.kt
@@ -1,18 +1,20 @@
 
 
 import com.mongodb.ExplainVerbosity
+import com.mongodb.assertions.Assertions.assertNotNull
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.count
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
-
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class FlowTest {
diff --git a/examples/src/test/kotlin/GeoTest.kt b/examples/src/test/kotlin/GeoTest.kt
index 818f0de1..7fe6d57c 100644
--- a/examples/src/test/kotlin/GeoTest.kt
+++ b/examples/src/test/kotlin/GeoTest.kt
@@ -2,7 +2,6 @@
 import com.mongodb.client.model.Filters
 import com.mongodb.client.model.Indexes
 import com.mongodb.client.model.Projections
-import com.mongodb.client.model.Projections.*
 import com.mongodb.client.model.geojson.Point
 import com.mongodb.client.model.geojson.Polygon
 import com.mongodb.client.model.geojson.Position
@@ -10,12 +9,13 @@ import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.*
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import java.util.*
-import kotlin.test.*
-
+import org.junit.jupiter.api.TestInstance
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SearchGeospatialTest {
diff --git a/examples/src/test/kotlin/IndexesTest.kt b/examples/src/test/kotlin/IndexesTest.kt
index f99b2634..82607afc 100644
--- a/examples/src/test/kotlin/IndexesTest.kt
+++ b/examples/src/test/kotlin/IndexesTest.kt
@@ -1,7 +1,13 @@
 
 import com.mongodb.DuplicateKeyException
 import com.mongodb.MongoCommandException
-import com.mongodb.client.model.*
+import com.mongodb.client.model.ClusteredIndexOptions
+import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.IndexOptions
+import com.mongodb.client.model.Indexes
+import com.mongodb.client.model.Projections
+import com.mongodb.client.model.Sorts
 import com.mongodb.client.model.geojson.Point
 import com.mongodb.client.model.geojson.Position
 import com.mongodb.kotlin.client.coroutine.MongoClient
@@ -9,8 +15,12 @@ import config.getConfig
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.Document
-import org.junit.jupiter.api.*
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
@@ -59,12 +69,10 @@ class IndexesTest {
         private val config = getConfig()
         private val CONNECTION_URI_PLACEHOLDER = config.connectionUri
 
-        // :snippet-start: set-up
         val mongoClient = MongoClient.create(CONNECTION_URI_PLACEHOLDER)
         val database = mongoClient.getDatabase("sample_mflix")
         val moviesCollection = database.getCollection<Movie>("movies")
         val theatersCollection = database.getCollection<Theater>("theaters")
-        // :snippet-end:
 
         @BeforeAll
         @JvmStatic
diff --git a/examples/src/test/kotlin/InsertTest.kt b/examples/src/test/kotlin/InsertTest.kt
index 08d14ff1..77761244 100644
--- a/examples/src/test/kotlin/InsertTest.kt
+++ b/examples/src/test/kotlin/InsertTest.kt
@@ -7,10 +7,9 @@ import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.types.ObjectId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class InsertTest {
diff --git a/examples/src/test/kotlin/KotlinXSerializationTest.kt b/examples/src/test/kotlin/KotlinXSerializationTest.kt
index 616e0507..132adab4 100644
--- a/examples/src/test/kotlin/KotlinXSerializationTest.kt
+++ b/examples/src/test/kotlin/KotlinXSerializationTest.kt
@@ -17,11 +17,11 @@ import org.bson.codecs.kotlinx.KotlinSerializerCodec
 import org.bson.codecs.kotlinx.ObjectIdSerializer
 import org.bson.types.ObjectId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class KotlinXSerializationTest {
diff --git a/examples/src/test/kotlin/LimitTest.kt b/examples/src/test/kotlin/LimitTest.kt
index 91502f35..32d01737 100644
--- a/examples/src/test/kotlin/LimitTest.kt
+++ b/examples/src/test/kotlin/LimitTest.kt
@@ -6,10 +6,10 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import kotlin.test.*
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class LimitTest {
diff --git a/examples/src/test/kotlin/LoggingTest.kt b/examples/src/test/kotlin/LoggingTest.kt
index 3409b571..48835347 100644
--- a/examples/src/test/kotlin/LoggingTest.kt
+++ b/examples/src/test/kotlin/LoggingTest.kt
@@ -5,13 +5,12 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 // :snippet-start: slf4j-import
 import org.slf4j.LoggerFactory
 // :snippet-end:
-import java.util.*
-import kotlin.test.*
 
 // :replace-start: {
 //    "terms": {
diff --git a/examples/src/test/kotlin/MongoClientSettingsTest.kt b/examples/src/test/kotlin/MongoClientSettingsTest.kt
index f9cf7ca6..ceff28d8 100644
--- a/examples/src/test/kotlin/MongoClientSettingsTest.kt
+++ b/examples/src/test/kotlin/MongoClientSettingsTest.kt
@@ -8,8 +8,7 @@ import kotlinx.coroutines.runBlocking
 import org.bson.BsonInt64
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.assertEquals
 import java.util.concurrent.TimeUnit
 import kotlin.test.Ignore
 
@@ -64,7 +63,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -92,7 +91,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -117,7 +116,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -143,7 +142,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -173,7 +172,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -203,7 +202,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -233,7 +232,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
     @Ignore
@@ -261,7 +260,7 @@ class MongoClientSettingsTest {
             System.err.println(me)
         }
         higherScopedClient = mongoClient
-        Assertions.assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
+        assertEquals(1.0, higherScopedCommandResult["ok"].toString().toDouble())
     }
 
 }
diff --git a/examples/src/test/kotlin/MonitoringExampleTest.kt b/examples/src/test/kotlin/MonitoringExampleTest.kt
index 8e775c2b..8fb5a77b 100644
--- a/examples/src/test/kotlin/MonitoringExampleTest.kt
+++ b/examples/src/test/kotlin/MonitoringExampleTest.kt
@@ -1,7 +1,14 @@
 
 import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
-import com.mongodb.event.*
+import com.mongodb.event.ClusterDescriptionChangedEvent
+import com.mongodb.event.ClusterListener
+import com.mongodb.event.CommandFailedEvent
+import com.mongodb.event.CommandListener
+import com.mongodb.event.CommandSucceededEvent
+import com.mongodb.event.ConnectionCheckOutFailedEvent
+import com.mongodb.event.ConnectionCheckedOutEvent
+import com.mongodb.event.ConnectionPoolListener
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import com.mongodb.management.JMXConnectionPoolListener
 import config.getConfig
diff --git a/examples/src/test/kotlin/NetworkCompressionTest.kt b/examples/src/test/kotlin/NetworkCompressionTest.kt
index 75542b12..8cebb2c1 100644
--- a/examples/src/test/kotlin/NetworkCompressionTest.kt
+++ b/examples/src/test/kotlin/NetworkCompressionTest.kt
@@ -1,14 +1,16 @@
-import com.mongodb.*
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoCompressor
+import com.mongodb.MongoException
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.runBlocking
 import org.bson.BsonInt64
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.Ignore
+import kotlin.test.assertEquals
 
 
 // :replace-start: {
diff --git a/examples/src/test/kotlin/ProjectTest.kt b/examples/src/test/kotlin/ProjectTest.kt
index ef803eeb..2294053d 100644
--- a/examples/src/test/kotlin/ProjectTest.kt
+++ b/examples/src/test/kotlin/ProjectTest.kt
@@ -1,20 +1,16 @@
 
-import com.mongodb.*
 import com.mongodb.client.model.Filters
-import com.mongodb.client.model.Filters.*
 import com.mongodb.client.model.Projections
-import com.mongodb.client.model.Projections.*
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class ProjectTest {
diff --git a/examples/src/test/kotlin/QueryDocumentTest.kt b/examples/src/test/kotlin/QueryDocumentTest.kt
index 26909ff5..a17d9284 100644
--- a/examples/src/test/kotlin/QueryDocumentTest.kt
+++ b/examples/src/test/kotlin/QueryDocumentTest.kt
@@ -6,11 +6,10 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class QueryDocumentTest {
diff --git a/examples/src/test/kotlin/QuickReferenceTest.kt b/examples/src/test/kotlin/QuickReferenceTest.kt
index 8df486a3..ea10d14f 100644
--- a/examples/src/test/kotlin/QuickReferenceTest.kt
+++ b/examples/src/test/kotlin/QuickReferenceTest.kt
@@ -1,5 +1,11 @@
 
-import com.mongodb.client.model.*
+import com.mongodb.client.model.DeleteManyModel
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.Indexes
+import com.mongodb.client.model.InsertOneModel
+import com.mongodb.client.model.Projections
+import com.mongodb.client.model.Sorts
+import com.mongodb.client.model.Updates
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.delay
diff --git a/examples/src/test/kotlin/RetrieveDataTest.kt b/examples/src/test/kotlin/RetrieveDataTest.kt
index 2ad9087f..a94b3fda 100644
--- a/examples/src/test/kotlin/RetrieveDataTest.kt
+++ b/examples/src/test/kotlin/RetrieveDataTest.kt
@@ -9,11 +9,10 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class RetrieveDataTest {
diff --git a/examples/src/test/kotlin/SearchTextTest.kt b/examples/src/test/kotlin/SearchTextTest.kt
index 3cc7bbbc..e5c4ea27 100644
--- a/examples/src/test/kotlin/SearchTextTest.kt
+++ b/examples/src/test/kotlin/SearchTextTest.kt
@@ -9,10 +9,11 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SearchTextTest {
diff --git a/examples/src/test/kotlin/SkipTest.kt b/examples/src/test/kotlin/SkipTest.kt
index f4d4ba3c..6167b6eb 100644
--- a/examples/src/test/kotlin/SkipTest.kt
+++ b/examples/src/test/kotlin/SkipTest.kt
@@ -8,11 +8,11 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SkipTest {
diff --git a/examples/src/test/kotlin/SortTest.kt b/examples/src/test/kotlin/SortTest.kt
index e7e1117f..8ed1699d 100644
--- a/examples/src/test/kotlin/SortTest.kt
+++ b/examples/src/test/kotlin/SortTest.kt
@@ -1,18 +1,18 @@
-
-import com.mongodb.client.model.*
-import com.mongodb.client.model.Sorts.*
+import com.mongodb.client.model.Aggregates
+import com.mongodb.client.model.Filters
+import com.mongodb.client.model.Indexes
+import com.mongodb.client.model.Projections
+import com.mongodb.client.model.Sorts
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
-
+import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SortTest {
@@ -73,7 +73,7 @@ internal class SortTest {
             FoodOrder(6, "c", "maple donut")
 
         )
-        assertEquals(expected, collection.find(filter).sort((ascending("_id"))).toList() )
+        assertEquals(expected, collection.find(filter).sort((Sorts.ascending("_id"))).toList() )
     }
 
     @Test
diff --git a/examples/src/test/kotlin/TimeSeriesTest.kt b/examples/src/test/kotlin/TimeSeriesTest.kt
index 23e49cf4..ff0a8c0f 100644
--- a/examples/src/test/kotlin/TimeSeriesTest.kt
+++ b/examples/src/test/kotlin/TimeSeriesTest.kt
@@ -1,8 +1,5 @@
 
-import com.mongodb.*
 import com.mongodb.client.model.CreateCollectionOptions
-import com.mongodb.client.model.Filters.*
-import com.mongodb.client.model.Projections.*
 import com.mongodb.client.model.TimeSeriesOptions
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
@@ -10,11 +7,9 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.bson.json.JsonWriterSettings
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
-
+import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class TimeSeriesTest {
diff --git a/examples/src/test/kotlin/TlsTest.kt b/examples/src/test/kotlin/TlsTest.kt
index 8ef63f0f..21ed9667 100644
--- a/examples/src/test/kotlin/TlsTest.kt
+++ b/examples/src/test/kotlin/TlsTest.kt
@@ -1,17 +1,17 @@
 
-import com.mongodb.*
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
 import com.mongodb.connection.netty.NettyStreamFactoryFactory
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import config.getConfig
 import io.netty.handler.ssl.SslContextBuilder
 import io.netty.handler.ssl.SslProvider
 import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
 import javax.net.ssl.SSLContext
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 // :replace-start: {
 //    "terms": {
diff --git a/examples/src/test/kotlin/UpsertTest.kt b/examples/src/test/kotlin/UpsertTest.kt
index 606517bf..b8e44256 100644
--- a/examples/src/test/kotlin/UpsertTest.kt
+++ b/examples/src/test/kotlin/UpsertTest.kt
@@ -8,11 +8,11 @@ import kotlinx.coroutines.runBlocking
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.types.ObjectId
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class UpsertTest {
diff --git a/examples/src/test/kotlin/WatchUsageExampleTest.kt b/examples/src/test/kotlin/WatchUsageExampleTest.kt
index a27089e6..30c68615 100644
--- a/examples/src/test/kotlin/WatchUsageExampleTest.kt
+++ b/examples/src/test/kotlin/WatchUsageExampleTest.kt
@@ -10,10 +10,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.bson.Document
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.add-fields.kt b/source/examples/generated/AggregatesBuilderTest.snippet.add-fields.kt
index 4eff261e..33b92907 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.add-fields.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.add-fields.kt
@@ -1,4 +1,4 @@
-addFields(
+Aggregates.addFields(
     Field("watched", false),
     Field("type", "movie")
 )
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto-options.kt b/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto-options.kt
index b8ebab75..3a6d5c93 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto-options.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto-options.kt
@@ -1,6 +1,6 @@
-bucketAuto(
+Aggregates.bucketAuto(
     "\$${Screen::price.name}", 5,
     BucketAutoOptions()
         .granularity(BucketGranularity.POWERSOF2)
-        .output(sum("count", 1), avg("avgPrice", "\$${Screen::price.name}"))
+        .output(Accumulators.sum("count", 1), Accumulators.avg("avgPrice", "\$${Screen::price.name}"))
         )
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto.kt b/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto.kt
index 7d1685c5..a6747015 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.bucket-auto.kt
@@ -1 +1 @@
-bucketAuto("\$${Screen::screenSize.name}", 5)
+Aggregates.bucketAuto("\$${Screen::screenSize.name}", 5)
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.bucket-options.kt b/source/examples/generated/AggregatesBuilderTest.snippet.bucket-options.kt
index 006d57ff..117342fe 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.bucket-options.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.bucket-options.kt
@@ -1,8 +1,8 @@
-bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70),
+Aggregates.bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70),
     BucketOptions()
         .defaultBucket("monster")
         .output(
-            sum("count", 1),
-            push("matches", "\$${Screen::screenSize.name}")
+            Accumulators.sum("count", 1),
+            Accumulators.push("matches", "\$${Screen::screenSize.name}")
         )
 )
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.bucket.kt b/source/examples/generated/AggregatesBuilderTest.snippet.bucket.kt
index 1fe96d66..a064b23b 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.bucket.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.bucket.kt
@@ -1 +1 @@
-bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70, 1000))
+Aggregates.bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70, 1000))
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.densify.kt b/source/examples/generated/AggregatesBuilderTest.snippet.densify.kt
index 5e0094fd..6894014d 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.densify.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.densify.kt
@@ -1,4 +1,4 @@
-densify(
+Aggregates.densify(
     "ts",
     DensifyRange.partitionRangeWithStep(15, MongoTimeUnit.MINUTE),
     DensifyOptions.densifyOptions().partitionByFields("Position.coordinates")
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.facet.kt b/source/examples/generated/AggregatesBuilderTest.snippet.facet.kt
index 42dfe79d..c03ad762 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.facet.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.facet.kt
@@ -1,15 +1,15 @@
-facet(
+Aggregates.facet(
     Facet(
         "Screen Sizes",
-        bucketAuto(
+        Aggregates.bucketAuto(
             "\$${Screen::screenSize.name}",
             5,
-            BucketAutoOptions().output(sum("count", 1))
+            BucketAutoOptions().output(Accumulators.sum("count", 1))
         )
     ),
     Facet(
         "Manufacturer",
-        sortByCount("\$${Screen::manufacturer.name}"),
-        limit(5)
+        Aggregates.sortByCount("\$${Screen::manufacturer.name}"),
+        Aggregates.limit(5)
     )
 )
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.fill.kt b/source/examples/generated/AggregatesBuilderTest.snippet.fill.kt
index 82130592..1a6f4a8d 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.fill.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.fill.kt
@@ -1,7 +1,7 @@
 val resultsFlow = weatherCollection.aggregate<Weather>(
     listOf(
         Aggregates.fill(
-            FillOptions.fillOptions().sortBy(ascending(Weather::hour.name)),
+            FillOptions.fillOptions().sortBy(Sorts.ascending(Weather::hour.name)),
             FillOutputField.value(Weather::temperature.name, "23.6C"),
             FillOutputField.linear(Weather::air_pressure.name)
         )
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.group.kt b/source/examples/generated/AggregatesBuilderTest.snippet.group.kt
index bb49ed4a..4fb5637d 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.group.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.group.kt
@@ -1,4 +1,4 @@
 Aggregates.group("\$${Order::customerId.name}",
-    sum("totalQuantity", "\$${Order::ordered.name}"),
-    avg("averageQuantity", "\$${Order::ordered.name}")
+    Accumulators.sum("totalQuantity", "\$${Order::ordered.name}"),
+    Accumulators.avg("averageQuantity", "\$${Order::ordered.name}")
 )
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.methods-example.kt b/source/examples/generated/AggregatesBuilderTest.snippet.methods-example.kt
index cef9cc6e..b2f933bc 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.methods-example.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.methods-example.kt
@@ -1,4 +1,4 @@
-val matchStage = match(Filters.eq("someField", "someCriteria"))
-val sortByCountStage = sortByCount("\$someField")
+val matchStage = Aggregates.match(Filters.eq("someField", "someCriteria"))
+val sortByCountStage = Aggregates.sortByCount("\$someField")
 val results = collection.aggregate(
     listOf(matchStage, sortByCountStage)).toList()
diff --git a/source/examples/generated/AggregatesBuilderTest.snippet.replace-root.kt b/source/examples/generated/AggregatesBuilderTest.snippet.replace-root.kt
index 2287956c..8515c32e 100644
--- a/source/examples/generated/AggregatesBuilderTest.snippet.replace-root.kt
+++ b/source/examples/generated/AggregatesBuilderTest.snippet.replace-root.kt
@@ -1 +1 @@
-replaceRoot("\$${Book::spanishTranslation.name}")
+Aggregates.replaceRoot("\$${Book::spanishTranslation.name}")
diff --git a/source/examples/generated/BuildersTest.snippet.builders.kt b/source/examples/generated/BuildersTest.snippet.builders.kt
index 60a4f814..1042f9f4 100644
--- a/source/examples/generated/BuildersTest.snippet.builders.kt
+++ b/source/examples/generated/BuildersTest.snippet.builders.kt
@@ -1,5 +1,5 @@
 data class Results(val email: String)
 
-val filter = and(eq(User::gender.name, "female"), gt(User::age.name, 29))
-val projection = fields(excludeId(), include("email"))
+val filter = Filters.and(Filters.eq(User::gender.name, "female"), Filters.gt(User::age.name, 29))
+val projection = Projections.fields(Projections.excludeId(), Projections.include("email"))
 val results = collection.find<Results>(filter).projection(projection)
diff --git a/source/examples/generated/ConnectTest.kt.snippet.connect-to-multiple-hosts-with-mongo-client-settings.kt b/source/examples/generated/ConnectTest.snippet.connect-to-multiple-hosts-with-mongo-client-settings.kt
similarity index 100%
rename from source/examples/generated/ConnectTest.kt.snippet.connect-to-multiple-hosts-with-mongo-client-settings.kt
rename to source/examples/generated/ConnectTest.snippet.connect-to-multiple-hosts-with-mongo-client-settings.kt
diff --git a/source/examples/generated/ConnectTest.kt.snippet.connect-to-multiple-hosts-with-string.kt b/source/examples/generated/ConnectTest.snippet.connect-to-multiple-hosts-with-string.kt
similarity index 100%
rename from source/examples/generated/ConnectTest.kt.snippet.connect-to-multiple-hosts-with-string.kt
rename to source/examples/generated/ConnectTest.snippet.connect-to-multiple-hosts-with-string.kt
diff --git a/source/examples/generated/ConnectTest.kt.snippet.connection-example.kt b/source/examples/generated/ConnectTest.snippet.connection-example.kt
similarity index 95%
rename from source/examples/generated/ConnectTest.kt.snippet.connection-example.kt
rename to source/examples/generated/ConnectTest.snippet.connection-example.kt
index e2bc8448..555624ed 100644
--- a/source/examples/generated/ConnectTest.kt.snippet.connection-example.kt
+++ b/source/examples/generated/ConnectTest.snippet.connection-example.kt
@@ -1,5 +1,5 @@
 // Replace the placeholder with your Atlas connection string
-val uri = CONNECTION_URI_PLACEHOLDER
+val uri = "<connection string>"
 
 // Construct a ServerApi instance using the ServerApi.builder() method
 val serverApi = ServerApi.builder()
diff --git a/source/fundamentals/aggregation-expression-operations.txt b/source/fundamentals/aggregation-expression-operations.txt
index 18e0e2da..16c6e574 100644
--- a/source/fundamentals/aggregation-expression-operations.txt
+++ b/source/fundamentals/aggregation-expression-operations.txt
@@ -35,11 +35,11 @@ in your code:
 .. code-block:: kotlin
    :copyable: true
 
-   import com.mongodb.client.model.Aggregates.*
-   import com.mongodb.client.model.Accumulators.*
-   import com.mongodb.client.model.Projections.*
-   import com.mongodb.client.model.Filters.*
-   import com.mongodb.client.model.mql.MqlValues.*
+   import com.mongodb.client.model.Aggregates
+   import com.mongodb.client.model.Accumulators
+   import com.mongodb.client.model.Projections
+   import com.mongodb.client.model.Filters
+   import com.mongodb.client.model.mql.MqlValues
 
 To access document fields in an expression, you need to reference the
 current document being processed by the aggregation pipeline. Use the
diff --git a/source/fundamentals/builders.txt b/source/fundamentals/builders.txt
index a854e7fb..26741705 100644
--- a/source/fundamentals/builders.txt
+++ b/source/fundamentals/builders.txt
@@ -83,8 +83,8 @@ Using Builders
 
 .. code-block:: kotlin
 
-   import com.mongodb.client.model.Filters.*
-   import com.mongodb.client.model.Projections.*
+   import com.mongodb.client.model.Filters
+   import com.mongodb.client.model.Projections
 
 .. literalinclude:: /examples/generated/BuildersTest.snippet.builders.kt
    :language: kotlin
diff --git a/source/fundamentals/builders/aggregates.txt b/source/fundamentals/builders/aggregates.txt
index 110e4104..8cb74070 100644
--- a/source/fundamentals/builders/aggregates.txt
+++ b/source/fundamentals/builders/aggregates.txt
@@ -29,11 +29,11 @@ The examples on this page assume imports for methods of the following classes:
 
 .. code-block:: kotlin
 
-   import com.mongodb.client.model.Aggregates.*
-   import com.mongodb.client.model.Filters.*
-   import com.mongodb.client.model.Projections.*
-   import com.mongodb.client.model.Sorts.*
-   import com.mongodb.client.model.Accumulators.*
+   import com.mongodb.client.model.Aggregates
+   import com.mongodb.client.model.Filters
+   import com.mongodb.client.model.Projections
+   import com.mongodb.client.model.Sorts
+   import com.mongodb.client.model.Accumulators
 
 Use these methods to construct pipeline stages and specify them in your
 aggregation as a list:
diff --git a/source/fundamentals/connection/connect.txt b/source/fundamentals/connection/connect.txt
index 26033033..18e0eabc 100644
--- a/source/fundamentals/connection/connect.txt
+++ b/source/fundamentals/connection/connect.txt
@@ -106,7 +106,7 @@ The following code shows how you can specify the connection string and
 the {+stable-api+} client option when connecting to a MongoDB
 deployment on Atlas and verify that the connection is successful:
 
-.. literalinclude:: /examples/generated/ConnectTest.kt.snippet.connection-example.kt
+.. literalinclude:: /examples/generated/ConnectTest.snippet.connection-example.kt
    :language: kotlin
 
 .. _kotlin-other-ways-to-connect:
@@ -168,12 +168,12 @@ class. Select the tab that corresponds to your preferred class.
    .. tab:: ConnectionString
       :tabid: connectionstring
 
-      .. literalinclude:: /examples/generated/ConnectTest.kt.snippet.connect-to-multiple-hosts-with-string.kt
+      .. literalinclude:: /examples/generated/ConnectTest.snippet.connect-to-multiple-hosts-with-string.kt
          :language: kotlin
 
    .. tab:: MongoClientSettings
       :tabid: mongoclientsettings
 
-      .. literalinclude:: /examples/generated/ConnectTest.kt.snippet.connect-to-multiple-hosts-with-mongo-client-settings.kt
+      .. literalinclude:: /examples/generated/ConnectTest.snippet.connect-to-multiple-hosts-with-mongo-client-settings.kt
          :language: kotlin