diff --git a/metadata.cc b/metadata.cc
index 20c0a0d..7dfc787 100644
--- a/metadata.cc
+++ b/metadata.cc
@@ -220,7 +220,7 @@
 
     // Due to bsdiff slowness, we're going to break each block group down
     // into metadata chunks and feed them to bsdiff.
-    __u32 num_chunks = 4;
+    __u32 num_chunks = 10;
     __u32 blocks_per_chunk = num_metadata_blocks / num_chunks;
     __u32 curr_block = bg_start_block;
     for (__u32 chunk = 0; chunk < num_chunks; chunk++) {
diff --git a/metadata_unittest.cc b/metadata_unittest.cc
index fde0b98..885197d 100644
--- a/metadata_unittest.cc
+++ b/metadata_unittest.cc
@@ -113,14 +113,26 @@
     off_t start_block; // Set to -1 to skip start block verification
     off_t num_blocks; // Set to -1 to skip num blocks verification
   } exp_results[] =
-      {{"<rootfs-bg-0-0-metadata>", 0, 260},
-       {"<rootfs-bg-0-1-metadata>", 260, 260},
-       {"<rootfs-bg-0-2-metadata>", 520, 260},
-       {"<rootfs-bg-0-3-metadata>", 780, 263},
-       {"<rootfs-bg-1-0-metadata>", 32768, 260},
-       {"<rootfs-bg-1-1-metadata>", 33028, 260},
-       {"<rootfs-bg-1-2-metadata>", 33288, 260},
-       {"<rootfs-bg-1-3-metadata>", 33548, 263},
+      {{"<rootfs-bg-0-0-metadata>", 0, 104},
+       {"<rootfs-bg-0-1-metadata>", 104, 104},
+       {"<rootfs-bg-0-2-metadata>", 208, 104},
+       {"<rootfs-bg-0-3-metadata>", 312, 104},
+       {"<rootfs-bg-0-4-metadata>", 416, 104},
+       {"<rootfs-bg-0-5-metadata>", 520, 104},
+       {"<rootfs-bg-0-6-metadata>", 624, 104},
+       {"<rootfs-bg-0-7-metadata>", 728, 104},
+       {"<rootfs-bg-0-8-metadata>", 832, 104},
+       {"<rootfs-bg-0-9-metadata>", 936, 107},
+       {"<rootfs-bg-1-0-metadata>", 32768, 104},
+       {"<rootfs-bg-1-1-metadata>", 32872, 104},
+       {"<rootfs-bg-1-2-metadata>", 32976, 104},
+       {"<rootfs-bg-1-3-metadata>", 33080, 104},
+       {"<rootfs-bg-1-4-metadata>", 33184, 104},
+       {"<rootfs-bg-1-5-metadata>", 33288, 104},
+       {"<rootfs-bg-1-6-metadata>", 33392, 104},
+       {"<rootfs-bg-1-7-metadata>", 33496, 104},
+       {"<rootfs-bg-1-8-metadata>", 33600, 104},
+       {"<rootfs-bg-1-9-metadata>", 33704, 107},
        {"<rootfs-inode-2-metadata>", -1, 1},
        {"<rootfs-inode-8-metadata>", -1, 4101},
        {"<rootfs-inode-11-metadata>", -1, 4},