diff --git a/expfmt/testdata/protobuf b/expfmt/testdata/protobuf
index d5aae5091..b2d018a7c 100644
Binary files a/expfmt/testdata/protobuf and b/expfmt/testdata/protobuf differ
diff --git a/expfmt/testdata/protobuf.gz b/expfmt/testdata/protobuf.gz
index 62fccb616..7622adb1c 100644
Binary files a/expfmt/testdata/protobuf.gz and b/expfmt/testdata/protobuf.gz differ
diff --git a/expfmt/testdata/test.gz b/expfmt/testdata/test.gz
deleted file mode 100644
index 3f8199dfb..000000000
--- a/expfmt/testdata/test.gz
+++ /dev/null
@@ -1,163 +0,0 @@
-1f8b 0808 2aa1 c754 0003 7465 7874 00b5
-5b5d 939b 3816 7def 5fa1 ea79 99a9 4d3c
-601b db3c f4c3 5426 55f3 309b ca6e 7ab7
-6a9e 281a d436 150c 04c4 a4bd 5df3 dff7
-4a88 361f 025d 094f 1e92 34e8 1cae 8ea4
-ab7b 04fd 03f9 ede3 ef9f c989 b122 28e9
-b79a 562c 88eb 3264 499e 05e7 242a f38a
-4679 1657 e4f1 44c9 6f8f 8f9f 896c 46d2
-90d1 2c4a 6845 928c 749b aeee 7e20 8f7f
-7cfe 8861 adea f339 2c2f 77fa a6af a730
-8b53 5a3e dcff 7cff ee5b 1d66 2c49 e9c3
-bdb3 f2ee ff22 ce12 027f 3101 9621 80ee
-7659 90a8 28af 3366 8eeb 2042 f887 558b
-7553 d158 a8a7 a4b1 d450 7259 2a69 84ee
-e28a e4e7 3365 6512 dd40 d429 2e1b 6527
-b96c e5ed 10da 6a6c 4c31 0043 cbf2 7213
-9915 4c96 22ab 9816 48dc d02d 10d8 8440
-050d ca30 3bd2 db89 ace2 5b22 b592 6fa9
-e092 74a9 ec46 3403 0216 9647 7a8b cc3c
-c565 29ba 9a6b 81e0 2de1 02b1 cd28 3a60
-f8b9 ca53 5a2d 2f1c 2698 2c44 9e62 b294
-f84a 6729 b029 4107 7a2c c3e2 b458 5a05
-8b85 ac2a 164b 491b 2a4b 394d c01d d889
-86c5 6225 c724 1642 2a48 2c75 144c 9632
-1a60 3ba8 8ac1 ed68 f96a 57f2 5868 a9e6
-b194 b325 b354 d40c 7e05 1665 0e45 dc89
-d68a bdca dd38 fbd5 7aef dd84 90cb e21e
-bcc3 6ab7 59df 8690 336e 9cc3 7eb5 396c
-8df5 eeb0 425c 7bff 70d8 ad3c 47fe 712d
-46a0 4fe8 fa60 96c7 16bc 4afe 4783 a70b
-a30a dfcd ef09 cf2d eeab cd76 07af 74d8
-d7fb 26b6 1a81 524c 6a0c 6a16 a675 cd9d
-a67a abac 0c07 e98f d158 ac0c 5827 3c29
-c694 819d 9144 0fb1 34ba 6604 6889 4c2c
-edb4 4e73 2674 4e2c 1cce cab1 9ac0 4dd4
-427a d359 ad26 fca4 4629 2d6a 81f5 3427
-31d6 0c6b 32f5 ca4d 5942 8c7e 7aac a587
-3423 3051 0fed 1667 959b f477 1ad5 1038
-2b33 6802 c7aa 6560 fb26 b59a b16a 334a
-a150 c6ae 0e0b c5ea 83f4 6f93 da4c f8ae
-195d b408 537b 8644 6215 c119 b149 41d4
-0e6a 460f 1dc0 c267 e1c1 5851 d08e 6a52
-9749 1f34 230d 0283 334c 6bdf b527 f017
-1368 1866 0cd0 66bb 3d1c b07a 619c 4e15
-b09c 8529 7914 7f67 f5f9 8996 247f ee39
-9e8a 9cc3 982a 8d4e 0b17 4fa6 e59d e2de
-6b94 c7d0 edb5 e3dc bf53 4ac3 ff93 c70f
-f7b0 8728 e3ac 0ac8 9c74 c292 3537 359e
-6ccc 3030 65a3 0638 5786 87f9 96b0 79dc
-8c31 1bb7 9d73 6673 1169 ad99 2918 ad85
-de9c e914 195b 2dbd 2e08 8cb1 3fb3 62c0
-eb84 7368 5ab1 d456 0ba1 1812 6868 d22c
-f046 9269 6d1a 46b0 91e3 c2c9 a587 5939
-356b 1673 e1f4 5e0d 2ddf d870 1988 8800
-1bdb 352b 0623 0911 860d 239f c279 e1a4
-c300 0d3d 9b05 1e2d 19ca b5e9 0453 1a30
-bd5c 3898 8171 33c4 a245 d25a 379d 4023
-27a6 1747 0fc1 bb37 3328 5a16 9d7f d3a9
-32f4 637a 51b4 0823 0b67 8c46 2b83 3071
-3a71 148e 4caf 0f06 84f4 71ce d65f 4021
-7c98 e31d 9650 341c bb2d 52b1 9e27 5b6f
-f79d 7758 5ae1 a6fc 1c5c 8f68 05cd 8b3a
-685f 7a75 5d5d 5d81 a703 1252 5d2a 46cf
-e4c3 e7ff 1096 9cc1 3515 3463 dc35 0d3f
-1c9d 666c 8dde 740b 1819 6f18 d931 2ff3
-9a25 1938 af4f 6f16 b373 919d 4246 a2ba
-2c21 9ef4 42e8 4b52 b151 309d f6c7 b03e
-d23b c58d bd33 7cf4 397c 099e e38a fc33
-7c49 cef5 b963 7173 e83d 7986 7124 31ad
-a232 2958 5e8e 2568 f1fd 47b6 570f aebf
-1e3e 91f3 8a9b 9f0c 1ff5 06ec 3feb edf2
-7a34 e230 6992 1834 0bce f49c 432d d498
-db7f cbab a4b9 2acc f1d8 1bcf 73f4 4350
-b7f1 569b c3de f1fc 35fd 87b3 1f86 068b
-bc64 019f 66ed fc20 5ff8 a566 e681 2630
-91db c610 6116 5152 67c9 0ba1 451e 9de6
-e6a4 82b8 1fac a281 bbda aed7 9bdd c1df
-1e36 3b88 7624 e49f 49c9 ea30 edf7 efbf
-cd45 9c8c 4a86 7e60 ca26 de6a eb6e f707
-dfe5 2a1e 3a71 c9a5 1ec4 1974 290e d23c
-ff5a 17c1 7398 a435 0c47 bbc0 41c4 eb8c
-fef5 d397 f75f 7e25 4d53 d236 ed86 8a22
-edac 7154 7b47 1735 225a 7d94 d8e8 da76
-7b45 54f4 cf30 ad43 587c dd4f 05d2 34e9
-7e63 dfde 21cf 3964 cd34 2512 0497 2051
-e590 9c68 5433 aa8a 5747 df9e 3ae1 21af
-ddbd c671 c596 698b f696 a017 81c5 2725
-d660 5334 df70 89bb 3641 8839 45d6 1bc5
-9449 f308 966c 05d8 f048 83e8 44a3 af45
-9e64 0c33 837e 14bf 9871 bdfb 1349 20ff
-c12c e5f3 e84a 0549 e5bd cc31 f218 45ec
-d650 46c6 d0aa cebe 2a17 8761 606f a9c8
-12af 5ae4 430a 0815 76ab ee6a 6783 6365
-d186 6f87 a55c 504f 17be 1124 2561 9742
-b9a6 e69f a148 06b3 8057 fe98 87fb a8a4
-21e3 8706 9e7f 30c5 42ec 1594 27e2 6ba4
-ad31 38c9 00e8 af1d 5320 2bc3 ace2 27e9
-00df ba9e 29bc ceae 4fd6 8d63 92c5 5080
-65c7 e029 64d1 2968 7ecd e8d2 9f0d ff92
-0bb4 1259 5234 242d 6ef8 8b49 5798 7e7c
-31cf 5664 5163 92f9 dcb6 8cce bf31 dd72
-3e91 1117 5234 29d2 359d 3dcd 8b99 fe74
-799b 28cd bc69 9afc 784d 126d 1284 95d6
-34f9 c978 e234 9ca6 3345 a046 5363 bd00
-ef2f c55b 1088 d136 c518 0fef b79a d690
-6dc2 228c 1276 11c9 feed 0759 ddbf 8db3
-686b 3086 036e cdd6 3505 7377 fc7b 53c3
-0ea5 343b b2d3 a052 6d27 e4f7 3061 bc3f
-b07b 3fc9 eed1 d8b8 5ff2 1166 bd92 204c
-f63e 5270 f971 5085 e722 a573 9bb1 6c41
-5a08 a627 4a72 ed2e 3c81 db38 dbbd bee6
-4a32 a8de 9238 284a 9ae6 613c 7a73 ade8
-996c 7a7d 815d d267 5a96 72ec 4292 e5d9
-7b71 c8c0 5d72 454b d8ab 5640 9480 16bc
-f6e2 439b 444d 0dc7 dd7b cd62 4889 316c
-6c4f 3495 e38e dacc 6603 47a8 368b d7cf
-0569 3445 49c0 0f1e 9af2 549e b38c aab2
-ced1 84d8 b805 58df cbf1 4334 337b 0c70
-1dcf 37ea cc6c 473a d1bf 03b7 16a5 75cc
-073e 4af3 8cb6 0535 94e6 2bba 6a7f f89e
-b013 0c32 4c8c ab06 883d a71f 9141 af79
-8f11 8598 8434 f373 a2c7 f2a6 f978 4920
-2e6a d978 bbd6 e753 591e 778a 88ce 6f9b
-ffd2 6ec9 3cf4 6b99 c88b 0289 e323 4543
-a80a 8450 fade cc3e 4ebb ffcf a147 75c0
-c659 6df6 fb1b 9035 47c6 9b95 b7f1 6fc1
-26e8 76eb dd6a bbdb d8f1 3515 8303 c3bb
-9af5 16b3 1cb2 82d8 e3a7 88a2 8490 9971
-5048 4800 b68e 98e0 d74c f509 14ac 54d3
-1e75 6a88 c914 d596 12b0 7017 f710 5750
-2831 fa24 d42c 7d8d ad97 f9c1 ded7 8f9e
-a2dd 1c87 88a1 b39f 2980 27a0 e730 8147
-6661 16f1 ad57 a63e f1a6 4521 5296 b3e4
-59d6 0895 daa7 fede 5c24 df7a e6a7 a299
-d88e c467 46a4 4703 1e28 e787 41ed 8e15
-9779 51c0 96d5 6ba4 dc97 10d1 2872 a11e
-356f 930d f123 1f6b 8ab7 2018 3b5f 04a6
-c964 aaa5 d107 232c 906a 9427 d7f8 2cfb
-6875 cfb6 761d 6cf8 4ac3 a30a 5b66 2aa3
-e8a7 32d3 4c5b 55dc 659d d2e0 7a0c 8f3e
-bc27 1ca8 39b3 c771 2b56 0f0a f82a 5a35
-f945 880a eb5a f5ae fff6 bca3 c572 2bde
-d189 048a 58bc 0557 91ff 3538 aac7 b135
-6fc6 27f8 fa25 8c71 bf4b b854 c67f c340
-4d10 2f1f a929 62f1 8bb7 8b87 eaca 0eda
-9a4b 3b1e ab1e a1eb 2116 bce2 ade7 b004
-114b fd0a 997d fba9 a157 d41e 1a84 2a69
-b547 1d83 ccfc 61b0 4388 db22 5dd5 d9f7
-3261 b01f b507 33aa d027 5847 1976 a2dd
-d6f1 77da 5865 26fe 30aa 5d13 46cf fd8d
-6022 70f2 915b 38de 1cc4 3c17 25cc 854a
-bc4b 6d8f 9ce8 4b01 c621 e665 22b8 72d2
-7c8e 48c2 4afc d41c b7c1 08c2 34ba 48a7
-de1e c149 d580 07f6 2bf8 4b59 0e29 bba3
-9168 66fb 69a2 0b78 7558 c214 904d df3e
-2ef8 2512 5f09 b4b7 a1f6 a5ec 3be5 6a44
-6558 a887 5143 a9d8 6ee6 11af edf5 877b
-d71b 7ca2 245e 1bbb db1b 9179 3724 f346
-19c5 9ecb bf25 9729 9948 997d 42fe 7ad0
-84a1 c992 238e b55d 8f54 53c0 b90d d568
-1fb4 a6ba 1dd3 e813 017b 2643 aae1 c8f3
-41f3 168d 7bf3 71df feee ff2d f9e8 431a
-5200 00
\ No newline at end of file
diff --git a/expfmt/testdata/text.gz b/expfmt/testdata/text.gz
new file mode 100644
index 000000000..b7658c84d
Binary files /dev/null and b/expfmt/testdata/text.gz differ