PR fixes

Author: katcharov

driver-sync/src/test/functional/com/mongodb/client/ChangeStreamProseTest.java

@@ -28,7 +28,6 @@
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
 import com.mongodb.client.model.changestream.SplitEvent;
-import com.mongodb.connection.ServerVersion;
 import com.mongodb.internal.operation.AggregateResponseBatchCursor;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
@@ -40,7 +39,6 @@
 
 import java.lang.reflect.Field;
 
-import static com.mongodb.ClusterFixture.getServerVersion;
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.ClusterFixture.serverVersionLessThan;
@@ -410,7 +408,7 @@ public void test16GetResumeTokenReturnsIdOfPreviousDocument() {
 
     @Test
     public void test19SplitChangeStreamEvents() {
-        assumeTrue(getServerVersion().compareTo(new ServerVersion(asList(6, 0, 9))) >= 0);
+        assumeTrue(serverVersionAtLeast(6, 0));
         collection.drop();
         database.createCollection(
                 getClass().getName(),