diff --git a/src/processor/testdata/module1.out b/src/processor/testdata/module1.out
index 80a7104a..63de4cfa 100644
--- a/src/processor/testdata/module1.out
+++ b/src/processor/testdata/module1.out
@@ -1,4 +1,4 @@
-MODULE windows x86 11111111-1111-1111-1111-111111111111 1 module1.pdb
+MODULE windows x86 111111111111111111111111111111111 module1.pdb
 FILE 1 file1_1.cc
 FILE 2 file1_2.cc
 FILE 3 file1_3.cc
diff --git a/src/processor/testdata/module2.out b/src/processor/testdata/module2.out
index db6adaec..265401c1 100644
--- a/src/processor/testdata/module2.out
+++ b/src/processor/testdata/module2.out
@@ -1,4 +1,4 @@
-MODULE windows x86 22222222 2 module2.pdb
+MODULE windows x86 222222222 module2.pdb
 FILE 1 file2_1.cc
 FILE 2 file2_2.cc
 FILE 3 file2_3.cc
diff --git a/src/processor/testdata/module3_bad.out b/src/processor/testdata/module3_bad.out
index 1a5e11ef..bb772486 100644
--- a/src/processor/testdata/module3_bad.out
+++ b/src/processor/testdata/module3_bad.out
@@ -1,3 +1,3 @@
-MODULE windows x86 33333333-3333-3333-3333-333333333333 3 module3.pdb
+MODULE windows x86 333333333333333333333333333333333 module3.pdb
 FILE 1 file1.cc
 FUNC 1000
diff --git a/src/processor/testdata/symbols/kernel32.pdb/BCE8785C57B44245A669896B6A19B9542/kernel32.sym b/src/processor/testdata/symbols/kernel32.pdb/BCE8785C57B44245A669896B6A19B9542/kernel32.sym
index f2856d1c..b813dbce 100644
--- a/src/processor/testdata/symbols/kernel32.pdb/BCE8785C57B44245A669896B6A19B9542/kernel32.sym
+++ b/src/processor/testdata/symbols/kernel32.pdb/BCE8785C57B44245A669896B6A19B9542/kernel32.sym
@@ -1,4 +1,4 @@
-MODULE windows x86 bce8785c-57b4-4245-a669-896b6a19b954 2 kernel32.pdb
+MODULE windows x86 BCE8785C57B44245A669896B6A19B9542 kernel32.pdb
 PUBLIC b5ae c BaseDllInitialize
 PUBLIC 9b47 4 CloseHandle
 PUBLIC 17826 0 BaseDllInitializeMemoryManager
diff --git a/src/processor/testdata/symbols/test_app.pdb/8DDB7E9A365748938D6EB08B1DCA31AA1/test_app.sym b/src/processor/testdata/symbols/test_app.pdb/8DDB7E9A365748938D6EB08B1DCA31AA1/test_app.sym
index e00579ac..0636947b 100644
--- a/src/processor/testdata/symbols/test_app.pdb/8DDB7E9A365748938D6EB08B1DCA31AA1/test_app.sym
+++ b/src/processor/testdata/symbols/test_app.pdb/8DDB7E9A365748938D6EB08B1DCA31AA1/test_app.sym
@@ -1,4 +1,4 @@
-MODULE windows x86 8ddb7e9a-3657-4893-8d6e-b08b1dca31aa 1 test_app.pdb
+MODULE windows x86 8DDB7E9A365748938D6EB08B1DCA31AA1 test_app.pdb
 FILE 1 c:\program files\microsoft visual studio 8\vc\platformsdk\include\pshpack2.h
 FILE 2 c:\program files\microsoft visual studio 8\vc\platformsdk\include\winuser.h
 FILE 3 c:\program files\microsoft visual studio 8\vc\include\wtime.inl
diff --git a/src/tools/windows/dump_syms/testdata/dump_syms_regtest.out b/src/tools/windows/dump_syms/testdata/dump_syms_regtest.out
index 60a61cc5..d85961fe 100644
--- a/src/tools/windows/dump_syms/testdata/dump_syms_regtest.out
+++ b/src/tools/windows/dump_syms/testdata/dump_syms_regtest.out
@@ -1,4 +1,4 @@
-MODULE windows x86 21b67c7e-eef6-4504-b05a-a650d11afce4 2 dump_syms_regtest.pdb
+MODULE windows x86 21B67C7EEEF64504B05AA650D11AFCE42 dump_syms_regtest.pdb
 FILE 1 c:\airbag\tools\windows\dump_syms\Release\dump_syms.exe.embed.manifest.res
 FILE 2 c:\program files\microsoft visual studio 8\vc\platformsdk\include\propidl.h
 FILE 3 c:\program files\microsoft visual studio 8\vc\include\xlocinfo