diff --git a/t/maxmind-db b/t/maxmind-db
index 6a690a70..0ea6c04e 160000
--- a/t/maxmind-db
+++ b/t/maxmind-db
@@ -1 +1 @@
-Subproject commit 6a690a705bc6962c0025a32e94a8f0dc8f86418c
+Subproject commit 0ea6c04e3a14375937f93554b54e4902f739b2ae
diff --git a/t/metadata_t.c b/t/metadata_t.c
index a7e58560..a1742268 100644
--- a/t/metadata_t.c
+++ b/t/metadata_t.c
@@ -3,8 +3,8 @@
 void test_metadata(MMDB_s *mmdb, const char *mode_desc) {
     cmp_ok(mmdb->metadata.node_count,
            "==",
-           163,
-           "node_count is 163 - %s",
+           139,
+           "node_count is 139 - %s",
            mode_desc);
     cmp_ok(mmdb->metadata.record_size,
            "==",
@@ -197,7 +197,7 @@ void test_metadata_as_data_entry_list(MMDB_s *mmdb, const char *mode_desc) {
         if (strcmp(key_name, "node_count") == 0) {
             MMDB_entry_data_list_s *value = entry_data_list =
                 entry_data_list->next;
-            cmp_ok(value->entry_data.uint32, "==", 163, "node_count == 163");
+            cmp_ok(value->entry_data.uint32, "==", 139, "node_count == 139");
         } else if (strcmp(key_name, "record_size") == 0) {
             MMDB_entry_data_list_s *value = entry_data_list =
                 entry_data_list->next;
diff --git a/t/read_node_t.c b/t/read_node_t.c
index b6ab6d83..13f0d088 100644
--- a/t/read_node_t.c
+++ b/t/read_node_t.c
@@ -78,47 +78,47 @@ void run_24_bit_record_tests(int mode, const char *mode_desc) {
                                       0,
                                       1,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      435,
+                                      401,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       80,
                                       81,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      323,
+                                      299,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       96,
                                       97,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      148,
+                                      147,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       103,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                       104,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       127,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
-                                      514,
+                                      424,
                                       MMDB_RECORD_TYPE_DATA,
                                   },
                                   {
                                       132,
-                                      527,
+                                      491,
                                       MMDB_RECORD_TYPE_DATA,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                   },
                                   {
                                       241,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                       242,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
@@ -139,47 +139,47 @@ void run_28_bit_record_tests(int mode, const char *mode_desc) {
                                       0,
                                       1,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      435,
+                                      401,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       80,
                                       81,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      323,
+                                      299,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       96,
                                       97,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      148,
+                                      147,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       103,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                       104,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       127,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
-                                      514,
+                                      424,
                                       MMDB_RECORD_TYPE_DATA,
                                   },
                                   {
                                       132,
-                                      527,
+                                      491,
                                       MMDB_RECORD_TYPE_DATA,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                   },
                                   {
                                       241,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                       242,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
@@ -200,47 +200,47 @@ void run_32_bit_record_tests(int mode, const char *mode_desc) {
                                       0,
                                       1,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      435,
+                                      401,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       80,
                                       81,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      323,
+                                      299,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       96,
                                       97,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
-                                      148,
+                                      147,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       103,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                       104,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,
                                   },
                                   {
                                       127,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
-                                      514,
+                                      424,
                                       MMDB_RECORD_TYPE_DATA,
                                   },
                                   {
                                       132,
-                                      527,
+                                      491,
                                       MMDB_RECORD_TYPE_DATA,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                   },
                                   {
                                       241,
-                                      444,
+                                      408,
                                       MMDB_RECORD_TYPE_EMPTY,
                                       242,
                                       MMDB_RECORD_TYPE_SEARCH_NODE,