diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index cc3dc63305..27a1ab0ed2 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1066,7 +1066,7 @@ buildvariants:
       mongodb-version: ["latest", "7.0", "6.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
-    display_name: ${auth-and-ssl} ${ruby} ${topology}
+    display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
     tasks:
       - name: "test-mlaunch"
 
@@ -1338,7 +1338,7 @@ buildvariants:
       topology: replica-set
       bson: "*"
       os: rhel8
-    display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
+    display_name: "bson-${bson} ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 8e56bcf887..67e2a92686 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -48,7 +48,7 @@ buildvariants:
       mongodb-version: <%= actual_and_upcoming_mdb %>
       topology: <%= topologies %>
       os: rhel8
-    display_name: ${auth-and-ssl} ${ruby} ${topology}
+    display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
     tasks:
       - name: "test-mlaunch"
 
@@ -320,7 +320,7 @@ buildvariants:
       topology: replica-set
       bson: "*"
       os: rhel8
-    display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
+    display_name: "bson-${bson} ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
diff --git a/spec/mongo/protocol/msg_spec.rb b/spec/mongo/protocol/msg_spec.rb
index 9c28da0196..23a4f41d1b 100644
--- a/spec/mongo/protocol/msg_spec.rb
+++ b/spec/mongo/protocol/msg_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # rubocop:todo all
 
-require 'lite_spec_helper'
+require 'spec_helper'
 require 'support/shared/protocol'
 
 describe Mongo::Protocol::Msg do
@@ -237,44 +237,6 @@
         end
       end
 
-=begin no longer supported
-      context 'when a 0 payload type is specified' do
-
-        let(:section) do
-          { type: 0, payload: { ismaster: 1 } }
-        end
-
-        let(:section_payload_type) { bytes.to_s[36] }
-        let(:section_bytes) { bytes.to_s[37..-1] }
-
-        it 'sets the payload type' do
-          expect(section_payload_type).to eq(0.chr)
-        end
-
-        it 'serializes the section' do
-          expect(section_bytes).to be_bson(section[:payload])
-        end
-      end
-
-      context 'when a no payload type is specified' do
-
-        let(:section) do
-          { payload: { ismaster: 1 } }
-        end
-
-        let(:section_payload_type) { bytes.to_s[36] }
-        let(:section_bytes) { bytes.to_s[37..-1] }
-
-        it 'sets the payload type as 0' do
-          expect(section_payload_type).to eq(0.chr)
-        end
-
-        it 'serializes the section' do
-          expect(section_bytes).to be_bson(section[:payload])
-        end
-      end
-=end
-
       context 'when a payload of type 1 is specified' do
 
         let(:section) do
@@ -366,32 +328,9 @@
           end
         end
       end
-
-=begin no longer supported
-      context 'when the sections are mixed types and payload type 1 comes before type 0' do
-
-        let(:section1) do
-          Mongo::Protocol::Msg::Section1.new('documents', [ { a: 1 } ])
-        end
-
-        let(:section2) do
-          { type: 0, payload: { 'b' => 2 } }
-        end
-
-        let(:sections) do
-          [ section1, section2 ]
-        end
-
-        it 'serializes all sections' do
-          expect(deserialized.documents).to eq([ BSON::Document.new(main_document), { 'a' => 1 }, { 'b' => 2 }])
-        end
-      end
-=end
     end
 
     context 'when the validating_keys option is true with payload 1' do
-      max_bson_version '4.99.99'
-
       let(:sequences) do
         [ section ]
       end