From f0dad8a007c75459d570a43d3871518b5f0568ac Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Thu, 28 Nov 2024 18:18:00 +0800
Subject: [PATCH] Convert zero-output EXPECT=<<EOF to single-line EXPECT=
 (#4746)

---
 test/db/abi/compilers/pelles_c          |   6 +-
 test/db/abi/languages/freepascal        |   3 +-
 test/db/analysis/8051                   |   3 +-
 test/db/analysis/arm64                  |   3 +-
 test/db/analysis/avr                    |   6 +-
 test/db/analysis/java                   |   3 +-
 test/db/analysis/sh                     |   3 +-
 test/db/analysis/x86_32                 |   6 +-
 test/db/analysis/x86_64                 |  21 ++--
 test/db/archos/linux-x64/bug_6678       |   3 +-
 test/db/archos/linux-x64/dbg            |   3 +-
 test/db/archos/linux-x64/dbg_dt         |   3 +-
 test/db/archos/windows-x64/dbg_oo       |   3 +-
 test/db/cmd/bug_backtick                |   6 +-
 test/db/cmd/cmd_0                       | 132 ++++++++----------------
 test/db/cmd/cmd_aae                     |   3 +-
 test/db/cmd/cmd_aes                     |   3 +-
 test/db/cmd/cmd_avg                     |   3 +-
 test/db/cmd/cmd_avr                     |   3 +-
 test/db/cmd/cmd_cond                    |  12 +--
 test/db/cmd/cmd_dmh                     |   3 +-
 test/db/cmd/cmd_flags                   |   9 +-
 test/db/cmd/cmd_foreach                 |   9 +-
 test/db/cmd/cmd_fuzzed                  |  21 ++--
 test/db/cmd/cmd_graph                   |  18 ++--
 test/db/cmd/cmd_hash                    |   3 +-
 test/db/cmd/cmd_i                       |  12 +--
 test/db/cmd/cmd_interpret               |   3 +-
 test/db/cmd/cmd_meta                    |   6 +-
 test/db/cmd/cmd_open                    |  12 +--
 test/db/cmd/cmd_p-                      |   3 +-
 test/db/cmd/cmd_p_capital_c             |   3 +-
 test/db/cmd/cmd_pd                      |  18 ++--
 test/db/cmd/cmd_pf                      |   3 +-
 test/db/cmd/cmd_pxd                     |   3 +-
 test/db/cmd/cmd_search                  |  24 ++---
 test/db/cmd/cmd_search_hit              |   9 +-
 test/db/cmd/cmd_system                  |   3 +-
 test/db/cmd/cmd_w                       |  12 +--
 test/db/cmd/cmd_wD                      |   3 +-
 test/db/cmd/feat_arithmetic             |   3 +-
 test/db/cmd/feat_graphdiff              |   3 +-
 test/db/cmd/feat_grep                   |   3 +-
 test/db/cmd/feat_input                  |   3 +-
 test/db/cmd/feat_yank                   |   3 +-
 test/db/cmd/metadata                    |   3 +-
 test/db/cmd/noreturn                    |   6 +-
 test/db/cmd/regexp                      |   3 +-
 test/db/cmd/shell                       |   3 +-
 test/db/cmd/types                       |   3 +-
 test/db/cmd/warnings                    |   3 +-
 test/db/extras/util                     |   9 +-
 test/db/formats/dol                     |   3 +-
 test/db/formats/dyldcache               |   3 +-
 test/db/formats/elf/bomb                |   3 +-
 test/db/formats/elf/crash               |   3 +-
 test/db/formats/elf/reloc               |   3 +-
 test/db/formats/elf/simple              |   3 +-
 test/db/formats/elf/sym_version         |   3 +-
 test/db/formats/elf/versioninfo         |   3 +-
 test/db/formats/firmware                |  24 ++---
 test/db/formats/luac/luac               |   6 +-
 test/db/formats/luac/luac53             |   6 +-
 test/db/formats/mach0/relocs            |   3 +-
 test/db/formats/mz/blocks               |   3 +-
 test/db/formats/mz/cblp0                |   3 +-
 test/db/formats/mz/chkdsk               |   3 +-
 test/db/formats/mz/ddriving             |   3 +-
 test/db/formats/mz/unzip                |   3 +-
 test/db/formats/nes                     |   3 +-
 test/db/formats/omf                     |  12 +--
 test/db/formats/pe/2331                 |   3 +-
 test/db/formats/pe/96emptysections      |   3 +-
 test/db/formats/pe/96workingsections    |   3 +-
 test/db/formats/pe/CoST                 |   3 +-
 test/db/formats/pe/a                    |   3 +-
 test/db/formats/pe/appendeddata         |   3 +-
 test/db/formats/pe/appendedhdr          |   3 +-
 test/db/formats/pe/appendedsecttbl      |   3 +-
 test/db/formats/pe/apphdrW7             |   3 +-
 test/db/formats/pe/appsectableW7        |   3 +-
 test/db/formats/pe/aslr-ld              |   3 +-
 test/db/formats/pe/b                    |   3 +-
 test/db/formats/pe/base                 |   3 +-
 test/db/formats/pe/base_FSG             |   3 +-
 test/db/formats/pe/bigSoRD              |   3 +-
 test/db/formats/pe/bigalign             |   3 +-
 test/db/formats/pe/bigib                |   3 +-
 test/db/formats/pe/bigsec               |   3 +-
 test/db/formats/pe/bottomsecttbl        |   3 +-
 test/db/formats/pe/c                    |   3 +-
 test/db/formats/pe/cfgbogus             |   3 +-
 test/db/formats/pe/compiled             |   3 +-
 test/db/formats/pe/copyright            |   3 +-
 test/db/formats/pe/ctxt                 |   3 +-
 test/db/formats/pe/ctxt-ld              |   3 +-
 test/db/formats/pe/d_nonnull            |   3 +-
 test/db/formats/pe/d_nonnull-ld         |   3 +-
 test/db/formats/pe/d_resource           |   3 +-
 test/db/formats/pe/d_resource-ld        |   3 +-
 test/db/formats/pe/d_tiny               |   3 +-
 test/db/formats/pe/d_tiny-ld            |   3 +-
 test/db/formats/pe/ddsect               |   3 +-
 test/db/formats/pe/debug                |   3 +-
 test/db/formats/pe/delaycorrupt         |   3 +-
 test/db/formats/pe/delayfake            |   3 +-
 test/db/formats/pe/delayimports         |   3 +-
 test/db/formats/pe/dep                  |   3 +-
 test/db/formats/pe/dll                  |   3 +-
 test/db/formats/pe/dll-dynld            |   3 +-
 test/db/formats/pe/dll-dynunicld        |   3 +-
 test/db/formats/pe/dll-ld               |   3 +-
 test/db/formats/pe/dll-webdavld         |   3 +-
 test/db/formats/pe/dllbound             |   3 +-
 test/db/formats/pe/dllbound-ld          |   3 +-
 test/db/formats/pe/dllbound-redirld     |   3 +-
 test/db/formats/pe/dllbound-redirldXP   |   3 +-
 test/db/formats/pe/dllbound2            |   3 +-
 test/db/formats/pe/dllcfgdup            |   3 +-
 test/db/formats/pe/dllcfgdup-dynld      |   3 +-
 test/db/formats/pe/dllemptyexp          |   3 +-
 test/db/formats/pe/dllemptyexp-ld       |   3 +-
 test/db/formats/pe/dllextep             |   3 +-
 test/db/formats/pe/dllextep-ld          |   3 +-
 test/db/formats/pe/dllfakess            |   3 +-
 test/db/formats/pe/dllfakess-dynld      |   3 +-
 test/db/formats/pe/dllfakess-ld         |   3 +-
 test/db/formats/pe/dllfw                |   3 +-
 test/db/formats/pe/dllfw-ld             |   3 +-
 test/db/formats/pe/dllfwloop            |   3 +-
 test/db/formats/pe/dllfwloop-ld         |   3 +-
 test/db/formats/pe/dllmaxvals           |   3 +-
 test/db/formats/pe/dllmaxvals-dynld     |   3 +-
 test/db/formats/pe/dllmaxvals-ld        |   3 +-
 test/db/formats/pe/dllnegep             |   3 +-
 test/db/formats/pe/dllnegep-ld          |   3 +-
 test/db/formats/pe/dllnoexp             |   3 +-
 test/db/formats/pe/dllnoexp-dynld       |   3 +-
 test/db/formats/pe/dllnomain            |   3 +-
 test/db/formats/pe/dllnomain-ld         |   3 +-
 test/db/formats/pe/dllnomain2           |   3 +-
 test/db/formats/pe/dllnomain2-dynld     |   3 +-
 test/db/formats/pe/dllnoreloc           |   3 +-
 test/db/formats/pe/dllnoreloc-ld        |   3 +-
 test/db/formats/pe/dllnullep            |   3 +-
 test/db/formats/pe/dllnullep-dynld      |   3 +-
 test/db/formats/pe/dllnullep-ld         |   3 +-
 test/db/formats/pe/dllord               |   3 +-
 test/db/formats/pe/dllord-ld            |   3 +-
 test/db/formats/pe/dllweirdexp          |   3 +-
 test/db/formats/pe/dllweirdexp-ld       |   3 +-
 test/db/formats/pe/dosZMXP              |   3 +-
 test/db/formats/pe/driver               |   3 +-
 test/db/formats/pe/dump_imports         |   3 +-
 test/db/formats/pe/duphead              |   3 +-
 test/db/formats/pe/dupsec               |   3 +-
 test/db/formats/pe/exceptions           |   3 +-
 test/db/formats/pe/exportobf            |   3 +-
 test/db/formats/pe/exports_doc          |   3 +-
 test/db/formats/pe/exports_order        |   3 +-
 test/db/formats/pe/exportsdata          |   3 +-
 test/db/formats/pe/fakenet              |   3 +-
 test/db/formats/pe/fakeregs             |   3 +-
 test/db/formats/pe/fakeregslib          |   3 +-
 test/db/formats/pe/fakerelocs           |   3 +-
 test/db/formats/pe/foldedhdr            |   3 +-
 test/db/formats/pe/foldedhdrW7          |   3 +-
 test/db/formats/pe/footer               |   3 +-
 test/db/formats/pe/gui                  |   3 +-
 test/db/formats/pe/hard_imports         |   3 +-
 test/db/formats/pe/hdrcode              |   3 +-
 test/db/formats/pe/hdrdata              |   3 +-
 test/db/formats/pe/hello_o              |   3 +-
 test/db/formats/pe/hiddenappdata1       |   3 +-
 test/db/formats/pe/hiddenappdata2       |   3 +-
 test/db/formats/pe/ibkernel             |   3 +-
 test/db/formats/pe/ibkmanual            |   3 +-
 test/db/formats/pe/ibknoreloc64         |   3 +-
 test/db/formats/pe/ibnullXP             |   3 +-
 test/db/formats/pe/ibreloc              |   3 +-
 test/db/formats/pe/ibrelocW7            |   3 +-
 test/db/formats/pe/impbyord             |   3 +-
 test/db/formats/pe/imports_apimsW7      |   3 +-
 test/db/formats/pe/imports_badterm      |   3 +-
 test/db/formats/pe/imports_bogusIAT     |   3 +-
 test/db/formats/pe/imports_corruptedIAT |   3 +-
 test/db/formats/pe/imports_iatindesc    |   3 +-
 test/db/formats/pe/imports_mixed        |   3 +-
 test/db/formats/pe/imports_multidesc    |   3 +-
 test/db/formats/pe/imports_nnIAT        |   3 +-
 test/db/formats/pe/imports_noext        |   3 +-
 test/db/formats/pe/imports_noint        |   3 +-
 test/db/formats/pe/imports_nothunk      |   3 +-
 test/db/formats/pe/imports_relocW7      |   3 +-
 test/db/formats/pe/imports_tinyW7       |   3 +-
 test/db/formats/pe/imports_tinyXP       |   3 +-
 test/db/formats/pe/imports_virtdesc     |   3 +-
 test/db/formats/pe/imports_vterm        |   3 +-
 test/db/formats/pe/importsdotXP         |   3 +-
 test/db/formats/pe/importshint          |   3 +-
 test/db/formats/pe/jman                 |   3 +-
 test/db/formats/pe/ldrsnaps             |   3 +-
 test/db/formats/pe/ldrsnaps64           |   3 +-
 test/db/formats/pe/lfanew_relocW7       |   3 +-
 test/db/formats/pe/lfanew_relocXP       |   3 +-
 test/db/formats/pe/lowsubsys            |   3 +-
 test/db/formats/pe/manifest             |   3 +-
 test/db/formats/pe/manifest_broken      |   3 +-
 test/db/formats/pe/manifest_bsod        |   3 +-
 test/db/formats/pe/manyimportsW7        |   3 +-
 test/db/formats/pe/maxsecXP             |   3 +-
 test/db/formats/pe/maxsec_lowaligW7     |   3 +-
 test/db/formats/pe/maxvals              |   3 +-
 test/db/formats/pe/memshared            |   3 +-
 test/db/formats/pe/memshared-ld         |   3 +-
 test/db/formats/pe/mini                 |   3 +-
 test/db/formats/pe/mscoree              |   3 +-
 test/db/formats/pe/multiss              |   3 +-
 test/db/formats/pe/multiss_con          |   3 +-
 test/db/formats/pe/multiss_drv          |   3 +-
 test/db/formats/pe/multiss_gui          |   3 +-
 test/db/formats/pe/mz                   |   3 +-
 test/db/formats/pe/namedresource        |   3 +-
 test/db/formats/pe/no0code              |   3 +-
 test/db/formats/pe/no_dd                |   3 +-
 test/db/formats/pe/no_dd64              |   3 +-
 test/db/formats/pe/no_dep               |   3 +-
 test/db/formats/pe/no_seh               |   3 +-
 test/db/formats/pe/normal               |   3 +-
 test/db/formats/pe/normal64             |   3 +-
 test/db/formats/pe/nosectionW7          |   3 +-
 test/db/formats/pe/nosectionXP          |   3 +-
 test/db/formats/pe/nothing              |   3 +-
 test/db/formats/pe/nothing-ld           |   3 +-
 test/db/formats/pe/nullEP               |   6 +-
 test/db/formats/pe/nullSOH-XP           |   3 +-
 test/db/formats/pe/nullvirt             |   3 +-
 test/db/formats/pe/ownexports           |   3 +-
 test/db/formats/pe/ownexports2          |   3 +-
 test/db/formats/pe/ownexportsdot        |   3 +-
 test/db/formats/pe/pdf                  |   3 +-
 test/db/formats/pe/pdf_zip_pe           |   3 +-
 test/db/formats/pe/pe                   |   3 +-
 test/db/formats/pe/pe32                 |   3 +-
 test/db/formats/pe/quine                |   3 +-
 test/db/formats/pe/reloc4               |   3 +-
 test/db/formats/pe/reloc9               |   3 +-
 test/db/formats/pe/relocOSdet           |   3 +-
 test/db/formats/pe/reloccrypt           |   3 +-
 test/db/formats/pe/reloccryptW8         |   3 +-
 test/db/formats/pe/reloccryptXP         |   3 +-
 test/db/formats/pe/relocsstripped       |   3 +-
 test/db/formats/pe/relocsstripped64     |   3 +-
 test/db/formats/pe/reshdr               |   3 +-
 test/db/formats/pe/safeseh              |   3 +-
 test/db/formats/pe/safeseh_fly          |   3 +-
 test/db/formats/pe/sc                   |   3 +-
 test/db/formats/pe/sectiondata          |   3 +-
 test/db/formats/pe/seh_change64         |   3 +-
 test/db/formats/pe/seh_x64              |   3 +-
 test/db/formats/pe/shuffledsect         |   3 +-
 test/db/formats/pe/signature            |   3 +-
 test/db/formats/pe/skippeddynbase       |   3 +-
 test/db/formats/pe/slackspace           |   3 +-
 test/db/formats/pe/ss63                 |   3 +-
 test/db/formats/pe/ss63nocookie         |   3 +-
 test/db/formats/pe/standard             |   3 +-
 test/db/formats/pe/tiny                 |   3 +-
 test/db/formats/pe/tinyW7               |   3 +-
 test/db/formats/pe/tinyW7_3264          |   3 +-
 test/db/formats/pe/tinyW7x64            |   3 +-
 test/db/formats/pe/tinyXP               |   3 +-
 test/db/formats/pe/tinydll              |   3 +-
 test/db/formats/pe/tinydll-ld           |   3 +-
 test/db/formats/pe/tinydllXP            |   3 +-
 test/db/formats/pe/tinydllXP-ld         |   3 +-
 test/db/formats/pe/tinydrivXP           |   3 +-
 test/db/formats/pe/tinygui              |   3 +-
 test/db/formats/pe/tinynet              |   3 +-
 test/db/formats/pe/tls                  |   3 +-
 test/db/formats/pe/tls64                |   3 +-
 test/db/formats/pe/tls_aoi              |   3 +-
 test/db/formats/pe/tls_aoiOSDET         |   3 +-
 test/db/formats/pe/tls_exiting          |   3 +-
 test/db/formats/pe/tls_import           |   3 +-
 test/db/formats/pe/tls_k32              |   3 +-
 test/db/formats/pe/tls_noEP             |   3 +-
 test/db/formats/pe/tls_obfuscation      |   3 +-
 test/db/formats/pe/tls_onthefly         |   3 +-
 test/db/formats/pe/tls_reloc            |   3 +-
 test/db/formats/pe/tls_virtEP           |   3 +-
 test/db/formats/pe/truncatedlast        |   3 +-
 test/db/formats/pe/truncsectbl          |   3 +-
 test/db/formats/pe/version_cust         |   3 +-
 test/db/formats/pe/version_mini         |   3 +-
 test/db/formats/pe/version_std          |   3 +-
 test/db/formats/pe/virtEP               |   3 +-
 test/db/formats/pe/virtgap              |   3 +-
 test/db/formats/pe/virtrelocXP          |   3 +-
 test/db/formats/pe/virtsectblXP         |   3 +-
 test/db/formats/pe/weirdsord            |   3 +-
 test/db/formats/pe/winver               |   3 +-
 test/db/formats/vsf/rambo2-norom        |   3 +-
 test/db/formats/vsf/rambo2-rom          |   3 +-
 test/db/formats/vsf/rhps-norom          |   3 +-
 test/db/formats/vsf/rhps-rom            |   3 +-
 test/db/formats/web_assembly            |   3 +-
 test/db/formats/xbe                     |   6 +-
 test/db/rzil/hexagon                    | 102 ++++++------------
 test/db/rzil/ppc64                      |   6 +-
 test/db/tools/rz                        |   3 +-
 test/db/tools/rz_asm                    |   3 +-
 test/db/tools/rz_bin                    |   9 +-
 test/db/tools/rz_find                   |   6 +-
 test/db/tools/rz_gg                     |   9 +-
 test/db/tools/rz_hash                   |  24 ++---
 test/db/tools/rz_test                   |   3 +-
 317 files changed, 475 insertions(+), 950 deletions(-)

diff --git a/test/db/abi/compilers/pelles_c b/test/db/abi/compilers/pelles_c
index 1298a0df276..c7d71149866 100644
--- a/test/db/abi/compilers/pelles_c
+++ b/test/db/abi/compilers/pelles_c
@@ -38,8 +38,7 @@ ARGS=-A
 CMDS=<<EOF
 pdf~main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=ELF_ABI : Pelles C 64 load
@@ -82,7 +81,6 @@ ARGS=-A
 CMDS=<<EOF
 pdf~main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
diff --git a/test/db/abi/languages/freepascal b/test/db/abi/languages/freepascal
index 7b706725eb1..c5252876df5 100644
--- a/test/db/abi/languages/freepascal
+++ b/test/db/abi/languages/freepascal
@@ -16,8 +16,7 @@ CMDS=<<EOF
 s main
 pdf
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=
 RUN
 
diff --git a/test/db/analysis/8051 b/test/db/analysis/8051
index ab841c5c386..85335dc8c9a 100644
--- a/test/db/analysis/8051
+++ b/test/db/analysis/8051
@@ -4,8 +4,7 @@ CMDS=<<EOF
 e asm.arch=8051
 e asm.bits=8
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=8051: checking bitness writing (asm.bits)
diff --git a/test/db/analysis/arm64 b/test/db/analysis/arm64
index 997e0bdf1de..c91fed5ec4e 100644
--- a/test/db/analysis/arm64
+++ b/test/db/analysis/arm64
@@ -46,8 +46,7 @@ e emu.str=1
 s 0x100011130
 pd 2~addChild
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=adrp string
diff --git a/test/db/analysis/avr b/test/db/analysis/avr
index 771535db780..19f4507753c 100644
--- a/test/db/analysis/avr
+++ b/test/db/analysis/avr
@@ -59,8 +59,7 @@ s 0x2d0
 wx 9093c007
 ao 1~jump
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=avr DISasm: negative baddr
@@ -776,8 +775,7 @@ s 0x2ee8
 af
 aae
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=
 RUN
 
diff --git a/test/db/analysis/java b/test/db/analysis/java
index e704617eb86..f0a5ce94bfa 100644
--- a/test/db/analysis/java
+++ b/test/db/analysis/java
@@ -1680,8 +1680,7 @@ NAME=Crash on analysis
 FILE=bins/java/fba022731cfdd80bc65a899afefead1e
 CMDS=e scr.prompt=false ; aaa
 REGEXP_FILTER_OUT=ignoreme
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Java Regs
diff --git a/test/db/analysis/sh b/test/db/analysis/sh
index f197dd2be1d..64d9f525ad8 100644
--- a/test/db/analysis/sh
+++ b/test/db/analysis/sh
@@ -68,8 +68,7 @@ wx 01e005400a25862f962fa62fb62fc62f
 af@0
 af fuck@0x6
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=SuperH regs
diff --git a/test/db/analysis/x86_32 b/test/db/analysis/x86_32
index ea36008bef2..a588cbba031 100644
--- a/test/db/analysis/x86_32
+++ b/test/db/analysis/x86_32
@@ -202,8 +202,7 @@ RUN
 NAME=adf bug #16215
 FILE==
 CMDS=adf
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=adf analysis on an obfuscated executable
@@ -1364,8 +1363,7 @@ CMDS=<<EOF
 aaa
 afb @ sym.imp.kernel32.dll_ExitProcess
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=xref aar on op.val
diff --git a/test/db/analysis/x86_64 b/test/db/analysis/x86_64
index 69c8e690ea4..9e4440ca3b6 100644
--- a/test/db/analysis/x86_64
+++ b/test/db/analysis/x86_64
@@ -650,8 +650,7 @@ CMDS=<<EOF
 aa > /dev/null
 afl~sym.__mh_execute_header[0]
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 
@@ -744,8 +743,7 @@ aa
 af-*
 afl
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=iS. and iSj. implementation
@@ -1358,8 +1356,7 @@ tfc CRTStartup THE_CC_THAT_NEVER_EXISTED
 aei
 aeim
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=2: Wrong calling convention
@@ -1622,8 +1619,7 @@ af
 afvr-*
 afvr-*
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=analysis vars crash 2
@@ -2738,8 +2734,7 @@ CMDS=<<EOF
 aaa
 fl~strlen~390
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=no function split without overlapping blocks
@@ -4077,8 +4072,7 @@ s 0x780
 af
 pdr~- case[2]
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=lea pseudo improvements (pseudo disabled)
@@ -4246,8 +4240,7 @@ FILE=bins/elf/dwarf_attr_check
 CMDS=<<EOF
 aaa
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=x86_64 int64_t variable overlapping removal
diff --git a/test/db/archos/linux-x64/bug_6678 b/test/db/archos/linux-x64/bug_6678
index 09c534918e3..d5cfa5f2090 100644
--- a/test/db/archos/linux-x64/bug_6678
+++ b/test/db/archos/linux-x64/bug_6678
@@ -1,6 +1,5 @@
 NAME="bug 6678: crash case"
 FILE==
 CMDS=-d malloc://512 ='
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/archos/linux-x64/dbg b/test/db/archos/linux-x64/dbg
index cf276ad70f4..8c29ab443e1 100644
--- a/test/db/archos/linux-x64/dbg
+++ b/test/db/archos/linux-x64/dbg
@@ -31,8 +31,7 @@ CMDS=<<EOF
 . scripts/set-LD_PRELOAD.rz
 !python3 scripts/dk_9.py
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 child received signal 9
 EOF
diff --git a/test/db/archos/linux-x64/dbg_dt b/test/db/archos/linux-x64/dbg_dt
index 0eece489631..640d54c0a7e 100644
--- a/test/db/archos/linux-x64/dbg_dt
+++ b/test/db/archos/linux-x64/dbg_dt
@@ -40,8 +40,7 @@ dt++ 0 1 2
 dt-
 dtl
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Graph call/ret trace (dtg)
diff --git a/test/db/archos/windows-x64/dbg_oo b/test/db/archos/windows-x64/dbg_oo
index f2ce69885cf..9575ef1bd58 100644
--- a/test/db/archos/windows-x64/dbg_oo
+++ b/test/db/archos/windows-x64/dbg_oo
@@ -4,6 +4,5 @@ CMDS=<<EOF
 (reopen; ood > $_; doc > $_)
 4 .(reopen)
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
\ No newline at end of file
diff --git a/test/db/cmd/bug_backtick b/test/db/cmd/bug_backtick
index ec6087530b8..58c6679147f 100644
--- a/test/db/cmd/bug_backtick
+++ b/test/db/cmd/bug_backtick
@@ -2,14 +2,12 @@ NAME=t/bug_backtick
 FILE==
 BROKEN=1
 CMDS=p8 3`~`
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Invalid offset due invalid command
 FILE==
 BROKEN=1
 CMDS=fd @ `entry1`
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/cmd_0 b/test/db/cmd/cmd_0
index ba5f104c78c..3c897930fa8 100644
--- a/test/db/cmd/cmd_0
+++ b/test/db/cmd/cmd_0
@@ -1,43 +1,37 @@
 NAME=p= 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=p= 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=p=d 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=p=d 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=p=e 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=p=e 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=p=p 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=p=p 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=p2 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=p2 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=p8 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=p8 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pb 0
@@ -59,155 +53,133 @@ RUN
 NAME=px 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=px 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=px/ 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=px/ 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxa 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxa 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxA 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxA 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxb 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxb 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxd 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxd 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxdh 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxdh 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxdw 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxdw 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxe 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxe 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxh 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxh 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxH 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxH 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxl 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxl 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxo 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxo 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxq 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxq 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxQ 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxQ 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxr 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxr 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxs 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxs 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxw 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxw 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxW 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pxW 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pd 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pd 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pD 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pD 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pda 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pda 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pdj 0
@@ -222,8 +194,7 @@ CMDS=<<EOF
 aa
 pdr 0
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pdf 0
@@ -232,22 +203,19 @@ CMDS=<<EOF
 aa
 pdf 0
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pdq 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pdq 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pdl 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pdl 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pdt 0
@@ -259,83 +227,71 @@ RUN
 NAME=pi 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pi 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pdq 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pdq 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pie 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pie 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pI 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pI 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pDq 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pDq 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pr 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pr 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=prx 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=prx 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=prg 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=prg 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pk 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pk 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pK 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pK 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pu 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=pu 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=puw 0
 FILE=bins/elf/analysis/hello-arm32
 CMDS=puw 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/cmd_aae b/test/db/cmd/cmd_aae
index 37329b48458..994a3fec4ad 100644
--- a/test/db/cmd/cmd_aae
+++ b/test/db/cmd/cmd_aae
@@ -2,6 +2,5 @@ NAME=crash aae oob
 FILE=bins/elf/arm32esilcrash
 TIMEOUT=2040
 CMDS=aae
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/cmd_aes b/test/db/cmd/cmd_aes
index b4b26212fbe..6be4df5c739 100644
--- a/test/db/cmd/cmd_aes
+++ b/test/db/cmd/cmd_aes
@@ -19,8 +19,7 @@ CMDS=<<EOF
 wx b8010000000f34b801000000cd80ebfe
 10aes
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=aes without initialize
diff --git a/test/db/cmd/cmd_avg b/test/db/cmd/cmd_avg
index aa0c58de128..2dce50b05bd 100644
--- a/test/db/cmd/cmd_avg
+++ b/test/db/cmd/cmd_avg
@@ -105,8 +105,7 @@ FILE==
 CMDS=<<EOF
 avgl foo
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: Global variable 'foo' does not exist!
 EOF
diff --git a/test/db/cmd/cmd_avr b/test/db/cmd/cmd_avr
index ba9710006bf..366e9ec50fc 100644
--- a/test/db/cmd/cmd_avr
+++ b/test/db/cmd/cmd_avr
@@ -9,8 +9,7 @@ RUN
 NAME=avrD msvc empty
 FILE=--
 CMDS=e analysis.cpp.abi=msvc;avrD ".?AV@@"
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=avrD msvc namespaces
diff --git a/test/db/cmd/cmd_cond b/test/db/cmd/cmd_cond
index f456d8ffbbe..f703a693565 100644
--- a/test/db/cmd/cmd_cond
+++ b/test/db/cmd/cmd_cond
@@ -15,8 +15,7 @@ CMDS=<<EOF
 %= 33
 %! echo win
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=condition 0%%
@@ -25,8 +24,7 @@ CMDS=<<EOF
 %= 0
 %% echo win
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=condition 0%!
@@ -51,8 +49,7 @@ RUN
 NAME=oneline condition 33%!
 FILE==
 CMDS=%= 33;%! echo win
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=oneline condition 0%!
@@ -66,6 +63,5 @@ RUN
 NAME=oneline condition 0%%
 FILE==
 CMDS=%= 0;%% echo win
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/cmd_dmh b/test/db/cmd/cmd_dmh
index 1d5c109d366..f5c34a96ab1 100644
--- a/test/db/cmd/cmd_dmh
+++ b/test/db/cmd/cmd_dmh
@@ -10,7 +10,6 @@ o malloc://512 0x10000 rwx
 omn 0x10000 [heap]
 dmh
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
diff --git a/test/db/cmd/cmd_flags b/test/db/cmd/cmd_flags
index 4d754b2739c..d5963ae78d0 100644
--- a/test/db/cmd/cmd_flags
+++ b/test/db/cmd/cmd_flags
@@ -40,15 +40,13 @@ RUN
 NAME=no flags
 FILE==
 CMDS=f
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=no flags*
 FILE==
 CMDS=f*
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=1: fs *
@@ -282,8 +280,7 @@ f a
 f-*
 fl
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=f.
diff --git a/test/db/cmd/cmd_foreach b/test/db/cmd/cmd_foreach
index 44da07b3efb..76a41be4191 100644
--- a/test/db/cmd/cmd_foreach
+++ b/test/db/cmd/cmd_foreach
@@ -128,16 +128,14 @@ NAME=iter dbt
 FILE==
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=iter threads
 FILE==
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=iter bbs
@@ -316,8 +314,7 @@ NAME=iter dbgmap
 FILE==
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=iter register
diff --git a/test/db/cmd/cmd_fuzzed b/test/db/cmd/cmd_fuzzed
index 0075c215de7..414d4fda3c6 100644
--- a/test/db/cmd/cmd_fuzzed
+++ b/test/db/cmd/cmd_fuzzed
@@ -4,8 +4,7 @@ CMDS=<<EOF
 e scr.null=true
 ibbbbbbbk
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=AFL - crash #3
@@ -14,8 +13,7 @@ CMDS=<<EOF
 e scr.null =true
 .dd dd)ddd dddr{G
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=AFL - crash #4
@@ -24,8 +22,7 @@ CMDS=<<EOF
 e scr.null=true
 *455%R*:**************
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=AFL - crash #5
@@ -34,8 +31,7 @@ CMDS=<<EOF
 e scr.null =true
 (((((((,(*;(((($(($(((((*<((()(((d
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=AFL - crash #7
@@ -44,8 +40,7 @@ CMDS=<<EOF
 e scr.null =true
 22.22.22ddd d do@
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Escaping crash
@@ -54,8 +49,7 @@ CMDS=<<EOF
 e scr.null=true
 \
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Escaping crash #2
@@ -64,6 +58,5 @@ CMDS=<<EOF
 e scr.null=true
 af \\
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/cmd_graph b/test/db/cmd/cmd_graph
index 4bd18741cee..5c17ce7c2fe 100644
--- a/test/db/cmd/cmd_graph
+++ b/test/db/cmd/cmd_graph
@@ -86,8 +86,7 @@ agn- title1
 agg k~nodes=
 agg k~nodes.title1
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=remove node with title that contain spaces
@@ -98,8 +97,7 @@ agn- "Title with spaces"
 agg k~nodes=
 agg k~nodes.Title with spaces
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=remove non-existent node
@@ -225,8 +223,7 @@ age title3 title1
 agg k~agraph.w=0x35
 agg | head -2 | tail -1 | tr -d " " | grep "=----------------="
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=graph size with self-referenced bb
@@ -237,8 +234,7 @@ age title1 title1
 agg k~agraph.w=0x16
 agg k~agraph.h=0x4
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=graph title
@@ -304,8 +300,7 @@ aaa
 s 0x00011390
 agf > /dev/null
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=super mario block (#8788)
@@ -348,8 +343,7 @@ CMDS=<<EOF
 af
 agf > /dev/null
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Test iCFG generation
diff --git a/test/db/cmd/cmd_hash b/test/db/cmd/cmd_hash
index eb23475addd..444e7ee38f8 100644
--- a/test/db/cmd/cmd_hash
+++ b/test/db/cmd/cmd_hash
@@ -38,6 +38,5 @@ CMDS=<<EOF
 #}~?
 #~~?
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
\ No newline at end of file
diff --git a/test/db/cmd/cmd_i b/test/db/cmd/cmd_i
index bd5ddc8a40c..4242235c1cd 100644
--- a/test/db/cmd/cmd_i
+++ b/test/db/cmd/cmd_i
@@ -4692,8 +4692,7 @@ RUN
 NAME=isq. (malloc)
 FILE=malloc://512
 CMDS=isq.
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=isq. (file x86)
@@ -4771,8 +4770,7 @@ RUN
 NAME=icqq (file x86)
 FILE=bins/elf/ls
 CMDS=icqq
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=iqqc (file Java)
@@ -4788,8 +4786,7 @@ NAME=iqqc (file x86)
 BROKEN=1
 FILE=bins/elf/ls
 CMDS=iqqc
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=iqcq (file Java)
@@ -4805,8 +4802,7 @@ NAME=iqcq (file x86)
 BROKEN=1
 FILE=bins/elf/ls
 CMDS=iqcq
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=auto entry (lib)
diff --git a/test/db/cmd/cmd_interpret b/test/db/cmd/cmd_interpret
index 163e8c51827..0dd1b3d234c 100644
--- a/test/db/cmd/cmd_interpret
+++ b/test/db/cmd/cmd_interpret
@@ -4,8 +4,7 @@ CMDS=<<EOF
 e cfg.editor=/bin/true
 .-
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=.echo echo
diff --git a/test/db/cmd/cmd_meta b/test/db/cmd/cmd_meta
index d33a5a2302f..12778dcf4f2 100644
--- a/test/db/cmd/cmd_meta
+++ b/test/db/cmd/cmd_meta
@@ -3,8 +3,7 @@ FILE==
 CMDS=<<EOF
 Cf.
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=vars commenting
@@ -72,8 +71,7 @@ CMDS=<<EOF
 aaa
 Cvb local_10
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=CC.
diff --git a/test/db/cmd/cmd_open b/test/db/cmd/cmd_open
index d1211a67c94..d2cc454f645 100644
--- a/test/db/cmd/cmd_open
+++ b/test/db/cmd/cmd_open
@@ -73,15 +73,13 @@ RUN
 NAME=o-[0]
 FILE=malloc://1024
 CMDS=o- `o~[0]`;o
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=oj-
 FILE=malloc://1024
 CMDS=o- `oj~{[0].fd}`;o
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=o =
@@ -120,8 +118,7 @@ RUN
 NAME=omn - crash
 FILE==
 CMDS=omn
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=oob 10
@@ -585,8 +582,7 @@ pd 3
 oa arm 64
 pd 3
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=open priority
diff --git a/test/db/cmd/cmd_p- b/test/db/cmd/cmd_p-
index 370ea8c7a59..ed5d1268606 100644
--- a/test/db/cmd/cmd_p-
+++ b/test/db/cmd/cmd_p-
@@ -33,8 +33,7 @@ RUN
 NAME=p- without any file
 FILE=--
 CMDS=p-
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=p- with malloc://512
diff --git a/test/db/cmd/cmd_p_capital_c b/test/db/cmd/cmd_p_capital_c
index 62800574032..15043b64189 100644
--- a/test/db/cmd/cmd_p_capital_c
+++ b/test/db/cmd/cmd_p_capital_c
@@ -4,8 +4,7 @@ CMDS=<<EOF
 e scr.null=true
 pCd 0x200
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pCa
diff --git a/test/db/cmd/cmd_pd b/test/db/cmd/cmd_pd
index feba0a714fc..1ac23e89d2e 100644
--- a/test/db/cmd/cmd_pd
+++ b/test/db/cmd/cmd_pd
@@ -92,22 +92,19 @@ RUN
 NAME=pd 0
 FILE=malloc://128
 CMDS=pd 0
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pd 1-1
 FILE=malloc://128
 CMDS=pd 1-1
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pd foo-33
 FILE=malloc://128
 CMDS=f foo @ 33;pd foo-33
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pd 1
@@ -1538,8 +1535,7 @@ CMDS=<<EOF
 e scr.null=true
 pd0~{}
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pI - crash
@@ -1548,8 +1544,7 @@ CMDS=<<EOF
 e scr.null=true
 pI 0x200
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pd bin.str.purge
@@ -2287,8 +2282,7 @@ e asm.arch=x86
 e asm.bits=64
 wx 90905152539090 ; pd 7 ~ 5 ~ push
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=print fcn header without asm.flags.real
diff --git a/test/db/cmd/cmd_pf b/test/db/cmd/cmd_pf
index 81aae97f2c9..165163b1c95 100644
--- a/test/db/cmd/cmd_pf
+++ b/test/db/cmd/cmd_pf
@@ -65,8 +65,7 @@ RUN
 NAME=Cf main
 FILE==
 CMDS=Cf main;C*
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Cf 1 n2
diff --git a/test/db/cmd/cmd_pxd b/test/db/cmd/cmd_pxd
index ee3b1fe0538..e6b22599cba 100644
--- a/test/db/cmd/cmd_pxd
+++ b/test/db/cmd/cmd_pxd
@@ -77,8 +77,7 @@ CMDS=<<EOF
 wx 554889e54157415641554154534881ec
 pxd 0
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pxdw negative arg
diff --git a/test/db/cmd/cmd_search b/test/db/cmd/cmd_search
index ce064ae9d54..bbf5f6a035b 100644
--- a/test/db/cmd/cmd_search
+++ b/test/db/cmd/cmd_search
@@ -685,8 +685,7 @@ e search.from=0x08048060
 e search.to=0x0804806b
 /s
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=/v{2,4,8} value search LE
@@ -860,8 +859,7 @@ e search.from=0x50
 e search.to=0x90
 /x 41424344
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=search range hex
@@ -887,8 +885,7 @@ e search.from=0x101
 e search.to=0x104
 /x 41424344
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=search range hex
@@ -900,8 +897,7 @@ e search.from=0x100
 e search.to=0x103
 /x 41424344
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=search range hex @(A..B)
@@ -923,8 +919,7 @@ w ABCD @ 0x100
 b 0x100
 /x 41424344 @(0x50 0x90)
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=backward search hex
@@ -950,8 +945,7 @@ e search.to=0x150
 b 0x100
 /bx 41424344
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=backward search hex
@@ -977,8 +971,7 @@ e search.to=0x103
 b 0x100
 /bx 41424344
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=backward search hex
@@ -990,8 +983,7 @@ e search.to=0x104
 b 0x100
 /bx 41424344
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=/x with bin mask
diff --git a/test/db/cmd/cmd_search_hit b/test/db/cmd/cmd_search_hit
index ea1510bb0ca..2950690bf2e 100644
--- a/test/db/cmd/cmd_search_hit
+++ b/test/db/cmd/cmd_search_hit
@@ -300,8 +300,7 @@ e search.from=0x00005c20
 e search.to=0x00005c44
 /r sym.imp.__cxa_finalize
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=cmd.hit for /s
@@ -346,8 +345,7 @@ e search.from=0x00000000
 e search.to=0x00000000
 /v1 1
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=from/to /V
@@ -377,6 +375,5 @@ e search.from=0x00000000
 e search.to=0x00000000
 /V1 1 5
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/cmd_system b/test/db/cmd/cmd_system
index 6d3c64c06a2..cc42ac1d42f 100644
--- a/test/db/cmd/cmd_system
+++ b/test/db/cmd/cmd_system
@@ -17,8 +17,7 @@ RUN
 NAME=!| grep
 FILE==
 CMDS=!echo magic|grep bob
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=!| sed
diff --git a/test/db/cmd/cmd_w b/test/db/cmd/cmd_w
index 3c5741f2e1e..09a93bc0a50 100644
--- a/test/db/cmd/cmd_w
+++ b/test/db/cmd/cmd_w
@@ -94,8 +94,7 @@ NAME=wu
 FILE==
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=wr
@@ -104,16 +103,14 @@ CMDS=<<EOF
 wr 4
 pv4~0x00000000
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=wA
 FILE==
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=wc
@@ -327,8 +324,7 @@ FILE==
 CMDS=<<EOF
 wv8\@10
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: Command 'wv8@10' does not exist.
 ERROR: Displaying the help of command 'wv8'.
diff --git a/test/db/cmd/cmd_wD b/test/db/cmd/cmd_wD
index 9ae1c638b06..d143dcf1950 100644
--- a/test/db/cmd/cmd_wD
+++ b/test/db/cmd/cmd_wD
@@ -42,8 +42,7 @@ RUN
 NAME=wD/ 41417641
 FILE==
 CMDS=wD/ 41417641
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=woE woD rc4
diff --git a/test/db/cmd/feat_arithmetic b/test/db/cmd/feat_arithmetic
index 03322806c66..e53e752405d 100644
--- a/test/db/cmd/feat_arithmetic
+++ b/test/db/cmd/feat_arithmetic
@@ -4,8 +4,7 @@ CMDS=<<EOF
 0
 ~[[0
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=sum flags
diff --git a/test/db/cmd/feat_graphdiff b/test/db/cmd/feat_graphdiff
index d9f37f9bf38..6a91b823c3f 100644
--- a/test/db/cmd/feat_graphdiff
+++ b/test/db/cmd/feat_graphdiff
@@ -1,6 +1,5 @@
 NAME=graphdiff segfault
 FILE==
 CMDS=cg / 2>/dev/null
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/cmd/feat_grep b/test/db/cmd/feat_grep
index 249c7d2314d..b043bd0cdac 100644
--- a/test/db/cmd/feat_grep
+++ b/test/db/cmd/feat_grep
@@ -1,8 +1,7 @@
 NAME=echo ~
 FILE=malloc://1024
 CMDS=echo jeje~jojo
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=echo \~
diff --git a/test/db/cmd/feat_input b/test/db/cmd/feat_input
index a87db204056..3860e4f16f2 100644
--- a/test/db/cmd/feat_input
+++ b/test/db/cmd/feat_input
@@ -138,8 +138,7 @@ echo abc > def>ghi  # should not hang
 "rm ./def>ghi"
 rm ./ghi
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=hash+space in quoted string
diff --git a/test/db/cmd/feat_yank b/test/db/cmd/feat_yank
index 62f6796b979..5ca31a00ffa 100644
--- a/test/db/cmd/feat_yank
+++ b/test/db/cmd/feat_yank
@@ -1,8 +1,7 @@
 NAME=yank-segfault
 FILE==
 CMDS=y -2
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=yank-and-paste
diff --git a/test/db/cmd/metadata b/test/db/cmd/metadata
index 883b73106be..17ffc1763fd 100644
--- a/test/db/cmd/metadata
+++ b/test/db/cmd/metadata
@@ -169,8 +169,7 @@ RUN
 NAME=Cf should be silent
 FILE==
 CMDS=Cf 32 2xx
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=format memory metadata
diff --git a/test/db/cmd/noreturn b/test/db/cmd/noreturn
index 9ea32e5ba32..c8899f2b14e 100644
--- a/test/db/cmd/noreturn
+++ b/test/db/cmd/noreturn
@@ -69,8 +69,7 @@ af
 af-
 afi~size
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=no no return 2
@@ -80,8 +79,7 @@ af
 af-*
 afi~size
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=noreturn real test
diff --git a/test/db/cmd/regexp b/test/db/cmd/regexp
index 934d6a9c5a1..c3d131c756f 100644
--- a/test/db/cmd/regexp
+++ b/test/db/cmd/regexp
@@ -25,8 +25,7 @@ w Test@444
 /e m
 /e m
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME="/e /t\wst\d\d\d\s\w\w/i" - rzshell
diff --git a/test/db/cmd/shell b/test/db/cmd/shell
index bc69562dcfe..0782d125242 100644
--- a/test/db/cmd/shell
+++ b/test/db/cmd/shell
@@ -3,7 +3,6 @@ FILE==
 CMDS=<<EOF
 
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
diff --git a/test/db/cmd/types b/test/db/cmd/types
index 26e8fc0bdfb..153b07b7050 100644
--- a/test/db/cmd/types
+++ b/test/db/cmd/types
@@ -402,8 +402,7 @@ td "enum pe_machine { IMAGE_FILE_MACHINE_IA64=0x200, IMAGE_FILE_MACHINE_I386=0x1
 t-*
 t
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=teb
diff --git a/test/db/cmd/warnings b/test/db/cmd/warnings
index f59e9ce53c6..33997f8864d 100644
--- a/test/db/cmd/warnings
+++ b/test/db/cmd/warnings
@@ -2,7 +2,6 @@ NAME=warning1 #missing regs for dwarf reg mapping in x86. issue #883
 FILE=bins/elf/find_x86-sok_gcc_m32_O2
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=
 RUN
\ No newline at end of file
diff --git a/test/db/extras/util b/test/db/extras/util
index 3959c9eae67..7e8e3b9b8db 100644
--- a/test/db/extras/util
+++ b/test/db/extras/util
@@ -15,8 +15,7 @@ RUN
 NAME=Missing Sort Params
 FILE==
 CMDS=sort 
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Uniq command
@@ -35,8 +34,7 @@ RUN
 NAME=Missing Uniq Params
 FILE==
 CMDS=uniq 
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Join command
@@ -53,6 +51,5 @@ RUN
 NAME=Missing join Params
 FILE==
 CMDS=join bins/other/test_file
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/dol b/test/db/formats/dol
index c043166131f..a565c8f3376 100644
--- a/test/db/formats/dol
+++ b/test/db/formats/dol
@@ -1,8 +1,7 @@
 NAME=DOL: sqrxz4 - open
 FILE=bins/dol/sqrxz4-gc.dol
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=DOL: sqrxz4 - iI
diff --git a/test/db/formats/dyldcache b/test/db/formats/dyldcache
index ca67d0ba0d1..9721a319994 100644
--- a/test/db/formats/dyldcache
+++ b/test/db/formats/dyldcache
@@ -596,8 +596,7 @@ CMDS=<<EOF
 aaa
 q
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=dyldcache 1042.1 header
diff --git a/test/db/formats/elf/bomb b/test/db/formats/elf/bomb
index c854ce66f38..86458c6ac8f 100644
--- a/test/db/formats/elf/bomb
+++ b/test/db/formats/elf/bomb
@@ -1,8 +1,7 @@
 NAME=ELF: bomb - open
 FILE=bins/elf/bomb
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=ELF: bomb - entrypoint
diff --git a/test/db/formats/elf/crash b/test/db/formats/elf/crash
index fb8a572bd56..ae0514857f4 100644
--- a/test/db/formats/elf/crash
+++ b/test/db/formats/elf/crash
@@ -1,8 +1,7 @@
 NAME=ELF: negative vnext crash
 FILE=bins/elf/analysis/6921737e-08e3-11e6-998c-a8ddd566ab1c.jpg
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pseudo-crash
diff --git a/test/db/formats/elf/reloc b/test/db/formats/elf/reloc
index f3589f18857..956447fab1c 100644
--- a/test/db/formats/elf/reloc
+++ b/test/db/formats/elf/reloc
@@ -15,8 +15,7 @@ RUN
 NAME=ELF: Spurious relocations
 FILE=bins/elf/analysis/spurious-relocs
 CMDS=ir~vaddr=0x0000003a
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=ELF: .plt/.plt.sec sections
diff --git a/test/db/formats/elf/simple b/test/db/formats/elf/simple
index a22ec3d7dc4..9f5495074b9 100644
--- a/test/db/formats/elf/simple
+++ b/test/db/formats/elf/simple
@@ -69,8 +69,7 @@ RUN
 NAME=ELF: local symbols
 FILE=bins/elf/analysis/example.elf
 CMDS=is*~d_41
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=ELF: phdr override
diff --git a/test/db/formats/elf/sym_version b/test/db/formats/elf/sym_version
index 3094ba2a107..edff96bc24d 100644
--- a/test/db/formats/elf/sym_version
+++ b/test/db/formats/elf/sym_version
@@ -1,7 +1,6 @@
 NAME=sym_version
 FILE=bins/elf/sym_version
 CMDS=
-EXPECT=<<EOF
-EOF
+EXPECT=
 TIMEOUT=5
 RUN
diff --git a/test/db/formats/elf/versioninfo b/test/db/formats/elf/versioninfo
index c1b4f223460..5de18fbf939 100644
--- a/test/db/formats/elf/versioninfo
+++ b/test/db/formats/elf/versioninfo
@@ -1,8 +1,7 @@
 NAME=ELF: no version info
 FILE=bins/elf/analysis/x64-simple
 CMDS=iV
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=ELF: versioninfo 1
diff --git a/test/db/formats/firmware b/test/db/formats/firmware
index 88f3f247e2e..9d7cbbcf2e2 100644
--- a/test/db/formats/firmware
+++ b/test/db/formats/firmware
@@ -1,8 +1,7 @@
 NAME=loading a BIOS file [64k]
 FILE=bins/firmware/bios_64k.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [64k]
@@ -48,8 +47,7 @@ RUN
 NAME=loading a BIOS file [128k]
 FILE=bins/firmware/bios_128k.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [128k]
@@ -73,8 +71,7 @@ RUN
 NAME=loading a BIOS file [256k]
 FILE=bins/firmware/bios_256k.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [256k]
@@ -98,8 +95,7 @@ RUN
 NAME=loading a BIOS file [512k]
 FILE=bins/firmware/bios_512k.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [512k]
@@ -123,8 +119,7 @@ RUN
 NAME=loading a BIOS file [1M]
 FILE=bins/firmware/bios_1M.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [1M]
@@ -148,8 +143,7 @@ RUN
 NAME=loading a BIOS file [2M]
 FILE=bins/firmware/bios_2M.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [2M]
@@ -173,8 +167,7 @@ RUN
 NAME=loading a BIOS file [4M]
 FILE=bins/firmware/bios_4M.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [4M]
@@ -198,8 +191,7 @@ RUN
 NAME=loading a BIOS file [8M]
 FILE=bins/firmware/bios_8M.bin
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding [8M]
diff --git a/test/db/formats/luac/luac b/test/db/formats/luac/luac
index 23881f015cd..7bff4cc5200 100644
--- a/test/db/formats/luac/luac
+++ b/test/db/formats/luac/luac
@@ -132,8 +132,7 @@ FILE=bins/luac/big.luac
 CMDS=<<EOF
 pd 10 >/dev/null
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 # see https://travis-ci.com/github/rizinorg/rizin/jobs/492588616
@@ -141,8 +140,7 @@ NAME=LUAC: broken file
 FILE=bins/luac/random.luac
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 REGEXP_FILTER_ERR=<<EOF
 ERROR:.+
 EOF
diff --git a/test/db/formats/luac/luac53 b/test/db/formats/luac/luac53
index 59e87b70a90..a114a7d7836 100644
--- a/test/db/formats/luac/luac53
+++ b/test/db/formats/luac/luac53
@@ -105,16 +105,14 @@ FILE=bins/luac/big53.luac
 CMDS=<<EOF
 pd 10 >/dev/null
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=LUAC: broken file
 FILE=bins/luac/random53.luac
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 REGEXP_FILTER_ERR=<<EOF
 ERROR:.+
 EOF
diff --git a/test/db/formats/mach0/relocs b/test/db/formats/mach0/relocs
index 1543d93fde7..4dd78b813ce 100644
--- a/test/db/formats/mach0/relocs
+++ b/test/db/formats/mach0/relocs
@@ -1485,8 +1485,7 @@ FILE=bins/mach0/reloc-symidx-overflow
 CMDS=<<EOF
 q
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=big endian external relocs
diff --git a/test/db/formats/mz/blocks b/test/db/formats/mz/blocks
index 78336b1f6ab..34d8ea2769f 100644
--- a/test/db/formats/mz/blocks
+++ b/test/db/formats/mz/blocks
@@ -2,8 +2,7 @@ NAME=MZ: blocks.exe - open
 FILE=bins/mz/blocks.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=MZ: blocks.exe - entrypoint
diff --git a/test/db/formats/mz/cblp0 b/test/db/formats/mz/cblp0
index a6419b5aa70..e0f2ed8ff02 100644
--- a/test/db/formats/mz/cblp0
+++ b/test/db/formats/mz/cblp0
@@ -2,8 +2,7 @@ NAME=MZ: cblp0.exe - open
 FILE=bins/mz/cblp0.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=MZ: cblp0.exe - entrypoint
diff --git a/test/db/formats/mz/chkdsk b/test/db/formats/mz/chkdsk
index b30139141e9..8951480b1f5 100644
--- a/test/db/formats/mz/chkdsk
+++ b/test/db/formats/mz/chkdsk
@@ -2,8 +2,7 @@ NAME=MZ: chkdsk.exe - open
 FILE=bins/mz/chkdsk.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=MZ: chkdsk.exe - entrypoint
diff --git a/test/db/formats/mz/ddriving b/test/db/formats/mz/ddriving
index cacc10f7cd5..ec43e831fbb 100644
--- a/test/db/formats/mz/ddriving
+++ b/test/db/formats/mz/ddriving
@@ -1,8 +1,7 @@
 NAME=MZ: corkami ddriving.exe - open
 FILE=bins/mz/ddriving.exe
 CMDS=q
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=MZ: corkami ddriving.exe - entrypoint
diff --git a/test/db/formats/mz/unzip b/test/db/formats/mz/unzip
index 58f06496bd0..7c6514d4a80 100644
--- a/test/db/formats/mz/unzip
+++ b/test/db/formats/mz/unzip
@@ -2,8 +2,7 @@ NAME=MZ: unzip.exe - open
 FILE=bins/mz/unzip.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=MZ: unzip.exe - entrypoint
diff --git a/test/db/formats/nes b/test/db/formats/nes
index 67e6eac3fd6..320048c1755 100644
--- a/test/db/formats/nes
+++ b/test/db/formats/nes
@@ -2,8 +2,7 @@ NAME=NES: Pong - open
 FILE=bins/nes/Pong.nes
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=NES: Pong - detection
diff --git a/test/db/formats/omf b/test/db/formats/omf
index 4724ff5c556..bd12a2b5734 100644
--- a/test/db/formats/omf
+++ b/test/db/formats/omf
@@ -141,27 +141,23 @@ RUN
 NAME=invalide index segment omf
 FILE=bins/omf/invalid_idx
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=invalide string size pubdef record omf
 FILE=bins/omf/invalid_str_pubdef
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=invalide string size lnames record omf
 FILE=bins/omf/invalid_str_lname
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=invalide record size omf
 FILE=bins/omf/invalid_size
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/2331 b/test/db/formats/pe/2331
index e728359a404..fea59a00ad1 100644
--- a/test/db/formats/pe/2331
+++ b/test/db/formats/pe/2331
@@ -2,6 +2,5 @@ NAME=PE: #2331
 FILE=bins/pe/2331
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/96emptysections b/test/db/formats/pe/96emptysections
index 039a8ac06a6..e4416a6d1be 100644
--- a/test/db/formats/pe/96emptysections
+++ b/test/db/formats/pe/96emptysections
@@ -2,8 +2,7 @@ NAME=PE: corkami 96emptysections.exe - open and analyse
 FILE=bins/pe/96emptysections.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami 96emptysections.exe - entrypoint
diff --git a/test/db/formats/pe/96workingsections b/test/db/formats/pe/96workingsections
index 6a63125de79..84b150a2bef 100644
--- a/test/db/formats/pe/96workingsections
+++ b/test/db/formats/pe/96workingsections
@@ -2,8 +2,7 @@ NAME=PE: corkami 96workingsections.exe - open and analyze
 FILE=bins/pe/96workingsections.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami 96workingsections.exe - entrypoint
diff --git a/test/db/formats/pe/CoST b/test/db/formats/pe/CoST
index 5b5fb330f05..2ba77d5d6f1 100644
--- a/test/db/formats/pe/CoST
+++ b/test/db/formats/pe/CoST
@@ -2,8 +2,7 @@ NAME=PE: corkami CoST.exe - open and analyze
 FILE=bins/pe/CoST.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami CoST.exe - entrypoint VA
diff --git a/test/db/formats/pe/a b/test/db/formats/pe/a
index 13e6e794bb7..01d3b665303 100644
--- a/test/db/formats/pe/a
+++ b/test/db/formats/pe/a
@@ -2,6 +2,5 @@ NAME=PE: corkami a.exe - open
 FILE=bins/pe/a.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/appendeddata b/test/db/formats/pe/appendeddata
index 25f7ae8ec19..4ff01a1533a 100644
--- a/test/db/formats/pe/appendeddata
+++ b/test/db/formats/pe/appendeddata
@@ -2,8 +2,7 @@ NAME=PE: corkami appendeddata.exe - open
 FILE=bins/pe/appendeddata.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami appendeddata.exe - entrypoint
diff --git a/test/db/formats/pe/appendedhdr b/test/db/formats/pe/appendedhdr
index a7c771cc273..ac4f9cc8f92 100644
--- a/test/db/formats/pe/appendedhdr
+++ b/test/db/formats/pe/appendedhdr
@@ -2,8 +2,7 @@ NAME=PE: corkami appendedhdr.exe - open
 FILE=bins/pe/appendedhdr.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami appendedhdr.exe - entrypoint
diff --git a/test/db/formats/pe/appendedsecttbl b/test/db/formats/pe/appendedsecttbl
index a137d2fac5e..d8b64a10365 100644
--- a/test/db/formats/pe/appendedsecttbl
+++ b/test/db/formats/pe/appendedsecttbl
@@ -2,8 +2,7 @@ NAME=PE: corkami appendedsecttbl.exe - open
 FILE=bins/pe/appendedsecttbl.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami appendedsecttbl.exe - entrypoint
diff --git a/test/db/formats/pe/apphdrW7 b/test/db/formats/pe/apphdrW7
index 46ecc1b7e63..b5ac49a97e6 100644
--- a/test/db/formats/pe/apphdrW7
+++ b/test/db/formats/pe/apphdrW7
@@ -2,8 +2,7 @@ NAME=PE: corkami apphdrW7.exe - open
 FILE=bins/pe/apphdrW7.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami apphdrW7.exe - entrypoint
diff --git a/test/db/formats/pe/appsectableW7 b/test/db/formats/pe/appsectableW7
index 0e3ce9482b2..c79529eb79c 100644
--- a/test/db/formats/pe/appsectableW7
+++ b/test/db/formats/pe/appsectableW7
@@ -2,8 +2,7 @@ NAME=PE: corkami appsectableW7.exe - open
 FILE=bins/pe/appsectableW7.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami appsectableW7.exe - entrypoint
diff --git a/test/db/formats/pe/aslr-ld b/test/db/formats/pe/aslr-ld
index 958f508a3eb..a49af4c6597 100644
--- a/test/db/formats/pe/aslr-ld
+++ b/test/db/formats/pe/aslr-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami aslr-ld.exe - open
 FILE=bins/pe/aslr-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami aslr-ld.exe - entrypoint
diff --git a/test/db/formats/pe/b b/test/db/formats/pe/b
index c5b3d637c6c..280c04a0f93 100644
--- a/test/db/formats/pe/b
+++ b/test/db/formats/pe/b
@@ -1,6 +1,5 @@
 NAME=PE: corkami b.exe - open
 FILE=bins/pe/b.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/base b/test/db/formats/pe/base
index fb308b59cb5..92099972968 100644
--- a/test/db/formats/pe/base
+++ b/test/db/formats/pe/base
@@ -1,8 +1,7 @@
 NAME=PE: corkami base.exe - open
 FILE=bins/pe/base.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Relocs
diff --git a/test/db/formats/pe/base_FSG b/test/db/formats/pe/base_FSG
index 51743ea3eed..ed7051c4556 100644
--- a/test/db/formats/pe/base_FSG
+++ b/test/db/formats/pe/base_FSG
@@ -1,8 +1,7 @@
 NAME=PE: FSG 2.0- open
 FILE=bins/pe/base_FSG.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: FSG 2.0- pi 1
diff --git a/test/db/formats/pe/bigSoRD b/test/db/formats/pe/bigSoRD
index 2afc15e365e..01af6fa813b 100644
--- a/test/db/formats/pe/bigSoRD
+++ b/test/db/formats/pe/bigSoRD
@@ -1,8 +1,7 @@
 NAME=PE: corkami bigSoRD.exe - open
 FILE=bins/pe/bigSoRD.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami bigSoRD.exe - entrypoint
diff --git a/test/db/formats/pe/bigalign b/test/db/formats/pe/bigalign
index 1e791e12875..775e2f6ead2 100644
--- a/test/db/formats/pe/bigalign
+++ b/test/db/formats/pe/bigalign
@@ -1,8 +1,7 @@
 NAME=PE: corkami bigalign.exe - open
 FILE=bins/pe/bigalign.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami bigalign.exe - entrypoint
diff --git a/test/db/formats/pe/bigib b/test/db/formats/pe/bigib
index bb73c96a549..5fbe18cf872 100644
--- a/test/db/formats/pe/bigib
+++ b/test/db/formats/pe/bigib
@@ -1,8 +1,7 @@
 NAME=PE: corkami bigib.exe - open
 FILE=bins/pe/bigib.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami bigib.exe - entrypoint
diff --git a/test/db/formats/pe/bigsec b/test/db/formats/pe/bigsec
index b2b5403b731..f574c351eed 100644
--- a/test/db/formats/pe/bigsec
+++ b/test/db/formats/pe/bigsec
@@ -1,8 +1,7 @@
 NAME=PE: corkami bigsec.exe - open
 FILE=bins/pe/bigsec.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami bigsec.exe - entrypoint
diff --git a/test/db/formats/pe/bottomsecttbl b/test/db/formats/pe/bottomsecttbl
index 03a52c215dd..613d72d453d 100644
--- a/test/db/formats/pe/bottomsecttbl
+++ b/test/db/formats/pe/bottomsecttbl
@@ -1,8 +1,7 @@
 NAME=PE: corkami bottomsecttbl.exe - open
 FILE=bins/pe/bottomsecttbl.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami bottomsecttbl.exe - entrypoint
diff --git a/test/db/formats/pe/c b/test/db/formats/pe/c
index ff7e9757d68..e3736d2f1ad 100644
--- a/test/db/formats/pe/c
+++ b/test/db/formats/pe/c
@@ -1,6 +1,5 @@
 NAME=PE: corkami c.exe - open
 FILE=bins/pe/c.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/cfgbogus b/test/db/formats/pe/cfgbogus
index 37619ae3687..ee72e4ae51c 100644
--- a/test/db/formats/pe/cfgbogus
+++ b/test/db/formats/pe/cfgbogus
@@ -1,8 +1,7 @@
 NAME=PE: corkami cfgbogus.exe - open
 FILE=bins/pe/cfgbogus.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami cfgbogus.exe - entrypoint
diff --git a/test/db/formats/pe/compiled b/test/db/formats/pe/compiled
index a50b7af1023..2858ce851f4 100644
--- a/test/db/formats/pe/compiled
+++ b/test/db/formats/pe/compiled
@@ -1,8 +1,7 @@
 NAME=PE: corkami compiled.exe - open
 FILE=bins/pe/compiled.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami compiled.exe - entrypoint
diff --git a/test/db/formats/pe/copyright b/test/db/formats/pe/copyright
index f227e595080..70a521f11a9 100644
--- a/test/db/formats/pe/copyright
+++ b/test/db/formats/pe/copyright
@@ -1,8 +1,7 @@
 NAME=PE: corkami copyright.exe - open
 FILE=bins/pe/copyright.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami copyright.exe - entrypoint
diff --git a/test/db/formats/pe/ctxt b/test/db/formats/pe/ctxt
index 47aee55a4bc..7c4e5694895 100644
--- a/test/db/formats/pe/ctxt
+++ b/test/db/formats/pe/ctxt
@@ -1,8 +1,7 @@
 NAME=PE: corkami ctxt.dll - open
 FILE=bins/pe/ctxt.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami ctxt.dll - entrypoint
diff --git a/test/db/formats/pe/ctxt-ld b/test/db/formats/pe/ctxt-ld
index bccd427af7b..6e6e57162d4 100644
--- a/test/db/formats/pe/ctxt-ld
+++ b/test/db/formats/pe/ctxt-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami ctxt-ld.exe - open
 FILE=bins/pe/ctxt-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami ctxt-ld.exe - entrypoint
diff --git a/test/db/formats/pe/d_nonnull b/test/db/formats/pe/d_nonnull
index bea514bc941..a19f0ea2329 100644
--- a/test/db/formats/pe/d_nonnull
+++ b/test/db/formats/pe/d_nonnull
@@ -1,8 +1,7 @@
 NAME=PE: corkami d_nonnull.dll - open
 FILE=bins/pe/d_nonnull.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami d_nonnull.dll - entrypoint
diff --git a/test/db/formats/pe/d_nonnull-ld b/test/db/formats/pe/d_nonnull-ld
index 558491306e6..30280718240 100644
--- a/test/db/formats/pe/d_nonnull-ld
+++ b/test/db/formats/pe/d_nonnull-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami d_nonnull-ld.exe - open
 FILE=bins/pe/d_nonnull-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami d_nonnull-ld - entrypoint
diff --git a/test/db/formats/pe/d_resource b/test/db/formats/pe/d_resource
index eeb2f9e6b86..4f8cd99d8a3 100644
--- a/test/db/formats/pe/d_resource
+++ b/test/db/formats/pe/d_resource
@@ -1,6 +1,5 @@
 NAME=PE: corkami d_resource.dll - open
 FILE=bins/pe/d_resource.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/d_resource-ld b/test/db/formats/pe/d_resource-ld
index 219768d0302..d1fe4b91752 100644
--- a/test/db/formats/pe/d_resource-ld
+++ b/test/db/formats/pe/d_resource-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami d_resource-ld.exe - open
 FILE=bins/pe/d_resource-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami d_resource-ld.exe - entrypoint
diff --git a/test/db/formats/pe/d_tiny b/test/db/formats/pe/d_tiny
index 3a312a219bd..f03fd6d9531 100644
--- a/test/db/formats/pe/d_tiny
+++ b/test/db/formats/pe/d_tiny
@@ -1,8 +1,7 @@
 NAME=PE: corkami d_tiny.dll - open
 FILE=bins/pe/d_tiny.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami d_tiny.dll - entrypoint
diff --git a/test/db/formats/pe/d_tiny-ld b/test/db/formats/pe/d_tiny-ld
index 90e197f3d8e..18d7e7deea7 100644
--- a/test/db/formats/pe/d_tiny-ld
+++ b/test/db/formats/pe/d_tiny-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami d_tiny-ld.exe - open
 FILE=bins/pe/d_tiny-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami d_tiny-ld.exe - entrypoint
diff --git a/test/db/formats/pe/ddsect b/test/db/formats/pe/ddsect
index 40291d4372f..1e07e0aa851 100644
--- a/test/db/formats/pe/ddsect
+++ b/test/db/formats/pe/ddsect
@@ -1,8 +1,7 @@
 NAME=PE: corkami ddsect.exe - open
 FILE=bins/pe/ddsect.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami ddsect.exe - entrypoint
diff --git a/test/db/formats/pe/debug b/test/db/formats/pe/debug
index 71c5d2e14b6..0ae41c10f92 100644
--- a/test/db/formats/pe/debug
+++ b/test/db/formats/pe/debug
@@ -1,8 +1,7 @@
 NAME=PE: corkami debug.exe - open
 FILE=bins/pe/debug.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami debug.exe - entrypoint
diff --git a/test/db/formats/pe/delaycorrupt b/test/db/formats/pe/delaycorrupt
index 7d5862f4b29..c76ccaa446e 100644
--- a/test/db/formats/pe/delaycorrupt
+++ b/test/db/formats/pe/delaycorrupt
@@ -1,8 +1,7 @@
 NAME=PE: corkami delaycorrupt.exe - open
 FILE=bins/pe/delaycorrupt.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami delaycorrupt.exe - entrypoint
diff --git a/test/db/formats/pe/delayfake b/test/db/formats/pe/delayfake
index 4279423a109..4a6e58452de 100644
--- a/test/db/formats/pe/delayfake
+++ b/test/db/formats/pe/delayfake
@@ -1,8 +1,7 @@
 NAME=PE: corkami delayfake.exe - open
 FILE=bins/pe/delayfake.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami delayfake.exe - entrypoint
diff --git a/test/db/formats/pe/delayimports b/test/db/formats/pe/delayimports
index 4cb79aed45d..e26aa336142 100644
--- a/test/db/formats/pe/delayimports
+++ b/test/db/formats/pe/delayimports
@@ -1,8 +1,7 @@
 NAME=PE: corkami delayimports.exe - open
 FILE=bins/pe/delayimports.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami delayimports.exe - entrypoint
diff --git a/test/db/formats/pe/dep b/test/db/formats/pe/dep
index be715dc0725..5ecc1631e40 100644
--- a/test/db/formats/pe/dep
+++ b/test/db/formats/pe/dep
@@ -1,8 +1,7 @@
 NAME=PE: corkami dep.exe - open
 FILE=bins/pe/dep.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dep.exe - dep enabled
diff --git a/test/db/formats/pe/dll b/test/db/formats/pe/dll
index fccb289e894..ec9816e4e7c 100644
--- a/test/db/formats/pe/dll
+++ b/test/db/formats/pe/dll
@@ -1,8 +1,7 @@
 NAME=PE: corkami dll.dll - open
 FILE=bins/pe/dll.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dll.dll - entrypoint
diff --git a/test/db/formats/pe/dll-dynld b/test/db/formats/pe/dll-dynld
index 5cc94115a98..6280c8b1353 100644
--- a/test/db/formats/pe/dll-dynld
+++ b/test/db/formats/pe/dll-dynld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dll-dynld.exe - open
 FILE=bins/pe/dll-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dll-dynld.exe - entrypoint
diff --git a/test/db/formats/pe/dll-dynunicld b/test/db/formats/pe/dll-dynunicld
index ec84877cb5f..099fbeec34a 100644
--- a/test/db/formats/pe/dll-dynunicld
+++ b/test/db/formats/pe/dll-dynunicld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dll-dynunicld.exe - open
 FILE=bins/pe/dll-dynunicld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dll-dynunicld.exe - entrypoint
diff --git a/test/db/formats/pe/dll-ld b/test/db/formats/pe/dll-ld
index 499cdcf3739..1a20f236e06 100644
--- a/test/db/formats/pe/dll-ld
+++ b/test/db/formats/pe/dll-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dll-ld.exe - open
 FILE=bins/pe/dll-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dll-ld.exe - entrypoint
diff --git a/test/db/formats/pe/dll-webdavld b/test/db/formats/pe/dll-webdavld
index 1936817e49c..43708158576 100644
--- a/test/db/formats/pe/dll-webdavld
+++ b/test/db/formats/pe/dll-webdavld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dll-webdavld.exe - open
 FILE=bins/pe/dll-webdavld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dll-webdavld.exe - entrypoint
diff --git a/test/db/formats/pe/dllbound b/test/db/formats/pe/dllbound
index fe11a3aab85..8ea8f4cbce5 100644
--- a/test/db/formats/pe/dllbound
+++ b/test/db/formats/pe/dllbound
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllbound.dll - open
 FILE=bins/pe/dllbound.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllbound.dll - entrypoint
diff --git a/test/db/formats/pe/dllbound-ld b/test/db/formats/pe/dllbound-ld
index 5b39a2ac424..20654ea00e0 100644
--- a/test/db/formats/pe/dllbound-ld
+++ b/test/db/formats/pe/dllbound-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllbound-ld.exe - open
 FILE=bins/pe/dllbound-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllbound-ld.exe - entrypoint
diff --git a/test/db/formats/pe/dllbound-redirld b/test/db/formats/pe/dllbound-redirld
index 87502a229ae..d99c30b3077 100644
--- a/test/db/formats/pe/dllbound-redirld
+++ b/test/db/formats/pe/dllbound-redirld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllbound-redirld.exe - open
 FILE=bins/pe/dllbound-redirld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllbound-redirld.exe - entrypoint
diff --git a/test/db/formats/pe/dllbound-redirldXP b/test/db/formats/pe/dllbound-redirldXP
index ff1e6f51794..5d4a42fe7eb 100644
--- a/test/db/formats/pe/dllbound-redirldXP
+++ b/test/db/formats/pe/dllbound-redirldXP
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllbound-redirldXP.exe - open
 FILE=bins/pe/dllbound-redirldXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllbound-redirldXP.exe - entrypoint
diff --git a/test/db/formats/pe/dllbound2 b/test/db/formats/pe/dllbound2
index 132c3194770..a3b7bd0e996 100644
--- a/test/db/formats/pe/dllbound2
+++ b/test/db/formats/pe/dllbound2
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllbound2.dll - open
 FILE=bins/pe/dllbound2.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllbound2.dll - entrypoint
diff --git a/test/db/formats/pe/dllcfgdup b/test/db/formats/pe/dllcfgdup
index fea56daaaf0..389b236c848 100644
--- a/test/db/formats/pe/dllcfgdup
+++ b/test/db/formats/pe/dllcfgdup
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllcfgdup.dll - open
 FILE=bins/pe/dllcfgdup.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllcfgdup.dll - entrypoint
diff --git a/test/db/formats/pe/dllcfgdup-dynld b/test/db/formats/pe/dllcfgdup-dynld
index eb17bb1ec4e..5d800cb9bee 100644
--- a/test/db/formats/pe/dllcfgdup-dynld
+++ b/test/db/formats/pe/dllcfgdup-dynld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllcfgdup-dynld.exe - open
 FILE=bins/pe/dllcfgdup-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllcfgdup-dynld.exe - entrypoint
diff --git a/test/db/formats/pe/dllemptyexp b/test/db/formats/pe/dllemptyexp
index b2c33da2793..a9c2111fc37 100644
--- a/test/db/formats/pe/dllemptyexp
+++ b/test/db/formats/pe/dllemptyexp
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllemptyexp.dll - open
 FILE=bins/pe/dllemptyexp.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllemptyexp.dll - entrypoint
diff --git a/test/db/formats/pe/dllemptyexp-ld b/test/db/formats/pe/dllemptyexp-ld
index 0b7863a2e73..6835731d10a 100644
--- a/test/db/formats/pe/dllemptyexp-ld
+++ b/test/db/formats/pe/dllemptyexp-ld
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllemptyexp-ld.exe - open
 FILE=bins/pe/dllemptyexp-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllemptyexp-ld.exe - entrypoint
diff --git a/test/db/formats/pe/dllextep b/test/db/formats/pe/dllextep
index 7695beba9d0..cb89857a22e 100644
--- a/test/db/formats/pe/dllextep
+++ b/test/db/formats/pe/dllextep
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllextep.dll - open
 FILE=bins/pe/dllextep.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllextep.dll - entrypoint
diff --git a/test/db/formats/pe/dllextep-ld b/test/db/formats/pe/dllextep-ld
index 7691b16290f..ffa92ca2cc9 100644
--- a/test/db/formats/pe/dllextep-ld
+++ b/test/db/formats/pe/dllextep-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllextep-ld.exe - open
 FILE=bins/pe/dllextep-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfakess b/test/db/formats/pe/dllfakess
index 51753e6d3c8..2e198910554 100644
--- a/test/db/formats/pe/dllfakess
+++ b/test/db/formats/pe/dllfakess
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfakess.dll - open
 FILE=bins/pe/dllfakess.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfakess-dynld b/test/db/formats/pe/dllfakess-dynld
index ea2856e0121..28f46cac774 100644
--- a/test/db/formats/pe/dllfakess-dynld
+++ b/test/db/formats/pe/dllfakess-dynld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfakess-dynld.exe - open
 FILE=bins/pe/dllfakess-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfakess-ld b/test/db/formats/pe/dllfakess-ld
index d623f75f929..48bd257fc26 100644
--- a/test/db/formats/pe/dllfakess-ld
+++ b/test/db/formats/pe/dllfakess-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfakess-ld.exe - open
 FILE=bins/pe/dllfakess-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfw b/test/db/formats/pe/dllfw
index 961f23887d0..e59ef4c305e 100644
--- a/test/db/formats/pe/dllfw
+++ b/test/db/formats/pe/dllfw
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfw.dll - open
 FILE=bins/pe/dllfw.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfw-ld b/test/db/formats/pe/dllfw-ld
index 6b1660cfc2e..cc2d053fce1 100644
--- a/test/db/formats/pe/dllfw-ld
+++ b/test/db/formats/pe/dllfw-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfw-ld.exe - open
 FILE=bins/pe/dllfw-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfwloop b/test/db/formats/pe/dllfwloop
index 072d5fbd4f3..008497b45cd 100644
--- a/test/db/formats/pe/dllfwloop
+++ b/test/db/formats/pe/dllfwloop
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfwloop.dll - open
 FILE=bins/pe/dllfwloop.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllfwloop-ld b/test/db/formats/pe/dllfwloop-ld
index a97f5bd311b..6492cece77b 100644
--- a/test/db/formats/pe/dllfwloop-ld
+++ b/test/db/formats/pe/dllfwloop-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllfwloop-ld.exe - open
 FILE=bins/pe/dllfwloop-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllmaxvals b/test/db/formats/pe/dllmaxvals
index 8572bc64c59..fcd89e1b29c 100644
--- a/test/db/formats/pe/dllmaxvals
+++ b/test/db/formats/pe/dllmaxvals
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllmaxvals.dll - open
 FILE=bins/pe/dllmaxvals.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllmaxvals-dynld b/test/db/formats/pe/dllmaxvals-dynld
index 6f6464b9667..86375fefa4b 100644
--- a/test/db/formats/pe/dllmaxvals-dynld
+++ b/test/db/formats/pe/dllmaxvals-dynld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllmaxvals-dynld.exe - open
 FILE=bins/pe/dllmaxvals-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllmaxvals-ld b/test/db/formats/pe/dllmaxvals-ld
index 507ffe6c582..1b3b6912b77 100644
--- a/test/db/formats/pe/dllmaxvals-ld
+++ b/test/db/formats/pe/dllmaxvals-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllmaxvals-ld.exe - open
 FILE=bins/pe/dllmaxvals-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnegep b/test/db/formats/pe/dllnegep
index eb06d6a8f64..914e594d892 100644
--- a/test/db/formats/pe/dllnegep
+++ b/test/db/formats/pe/dllnegep
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnegep.dll - open
 FILE=bins/pe/dllnegep.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnegep-ld b/test/db/formats/pe/dllnegep-ld
index 20879f428ed..4a841dabe76 100644
--- a/test/db/formats/pe/dllnegep-ld
+++ b/test/db/formats/pe/dllnegep-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnegep-ld.exe - open
 FILE=bins/pe/dllnegep-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnoexp b/test/db/formats/pe/dllnoexp
index 57965b236b7..e04355f4e61 100644
--- a/test/db/formats/pe/dllnoexp
+++ b/test/db/formats/pe/dllnoexp
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnoexp.dll - open
 FILE=bins/pe/dllnoexp.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnoexp-dynld b/test/db/formats/pe/dllnoexp-dynld
index 704d1f44730..f1b5f1e601a 100644
--- a/test/db/formats/pe/dllnoexp-dynld
+++ b/test/db/formats/pe/dllnoexp-dynld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnoexp-dynld.exe - open
 FILE=bins/pe/dllnoexp-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnomain b/test/db/formats/pe/dllnomain
index faf6c9eaf45..04a3d68586b 100644
--- a/test/db/formats/pe/dllnomain
+++ b/test/db/formats/pe/dllnomain
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnomain.dll - open
 FILE=bins/pe/dllnomain.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnomain-ld b/test/db/formats/pe/dllnomain-ld
index f8b47160cfd..7504aa0d432 100644
--- a/test/db/formats/pe/dllnomain-ld
+++ b/test/db/formats/pe/dllnomain-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnomain-ld.exe - open
 FILE=bins/pe/dllnomain-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnomain2 b/test/db/formats/pe/dllnomain2
index 147a25aa23d..8cad6b56d00 100644
--- a/test/db/formats/pe/dllnomain2
+++ b/test/db/formats/pe/dllnomain2
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnomain2.dll - open
 FILE=bins/pe/dllnomain2.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnomain2-dynld b/test/db/formats/pe/dllnomain2-dynld
index e992acbe1fe..05f8e44b203 100644
--- a/test/db/formats/pe/dllnomain2-dynld
+++ b/test/db/formats/pe/dllnomain2-dynld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnomain2-dynld.exe - open
 FILE=bins/pe/dllnomain2-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnoreloc b/test/db/formats/pe/dllnoreloc
index 9228bcb63c0..76559b98300 100644
--- a/test/db/formats/pe/dllnoreloc
+++ b/test/db/formats/pe/dllnoreloc
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnoreloc.dll - open
 FILE=bins/pe/dllnoreloc.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnoreloc-ld b/test/db/formats/pe/dllnoreloc-ld
index 96891544668..20161b0230f 100644
--- a/test/db/formats/pe/dllnoreloc-ld
+++ b/test/db/formats/pe/dllnoreloc-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnoreloc-ld.exe - open
 FILE=bins/pe/dllnoreloc-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnullep b/test/db/formats/pe/dllnullep
index 6d39f69ee5a..aec2fe40357 100644
--- a/test/db/formats/pe/dllnullep
+++ b/test/db/formats/pe/dllnullep
@@ -1,8 +1,7 @@
 NAME=PE: corkami dllnullep.dll - open
 FILE=bins/pe/dllnullep.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami dllnullep.dll - entrypoint
diff --git a/test/db/formats/pe/dllnullep-dynld b/test/db/formats/pe/dllnullep-dynld
index 3b621db2702..2e203a28e60 100644
--- a/test/db/formats/pe/dllnullep-dynld
+++ b/test/db/formats/pe/dllnullep-dynld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnullep-dynld.exe - open
 FILE=bins/pe/dllnullep-dynld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllnullep-ld b/test/db/formats/pe/dllnullep-ld
index 7734c78d4ff..225ca3afa90 100644
--- a/test/db/formats/pe/dllnullep-ld
+++ b/test/db/formats/pe/dllnullep-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllnullep-ld.exe - open
 FILE=bins/pe/dllnullep-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllord b/test/db/formats/pe/dllord
index a38a375efbe..afe41dcfc48 100644
--- a/test/db/formats/pe/dllord
+++ b/test/db/formats/pe/dllord
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllord.dll - open
 FILE=bins/pe/dllord.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllord-ld b/test/db/formats/pe/dllord-ld
index e6d956dce1f..b43c2045e7e 100644
--- a/test/db/formats/pe/dllord-ld
+++ b/test/db/formats/pe/dllord-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllord-ld.exe - open
 FILE=bins/pe/dllord-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllweirdexp b/test/db/formats/pe/dllweirdexp
index 51e2278e8ac..12c93f67f0a 100644
--- a/test/db/formats/pe/dllweirdexp
+++ b/test/db/formats/pe/dllweirdexp
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllweirdexp.dll - open
 FILE=bins/pe/dllweirdexp.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dllweirdexp-ld b/test/db/formats/pe/dllweirdexp-ld
index e54ccf0ec47..1e953579013 100644
--- a/test/db/formats/pe/dllweirdexp-ld
+++ b/test/db/formats/pe/dllweirdexp-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami dllweirdexp-ld.exe - open
 FILE=bins/pe/dllweirdexp-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dosZMXP b/test/db/formats/pe/dosZMXP
index 48212b3c79d..a19f219ebd7 100644
--- a/test/db/formats/pe/dosZMXP
+++ b/test/db/formats/pe/dosZMXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami dosZMXP.exe - open
 FILE=bins/pe/dosZMXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/driver b/test/db/formats/pe/driver
index 22e0c66615f..bdc7ac1cbc8 100644
--- a/test/db/formats/pe/driver
+++ b/test/db/formats/pe/driver
@@ -1,6 +1,5 @@
 NAME=PE: corkami driver.sys - open
 FILE=bins/pe/driver.sys
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dump_imports b/test/db/formats/pe/dump_imports
index f2b5a424e43..dfa35099495 100644
--- a/test/db/formats/pe/dump_imports
+++ b/test/db/formats/pe/dump_imports
@@ -1,6 +1,5 @@
 NAME=PE: corkami dump_imports.exe - open
 FILE=bins/pe/dump_imports.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/duphead b/test/db/formats/pe/duphead
index dc424997b92..decf8d6e549 100644
--- a/test/db/formats/pe/duphead
+++ b/test/db/formats/pe/duphead
@@ -1,6 +1,5 @@
 NAME=PE: corkami duphead.exe - open
 FILE=bins/pe/duphead.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/dupsec b/test/db/formats/pe/dupsec
index c60b592f602..98b3c865a32 100644
--- a/test/db/formats/pe/dupsec
+++ b/test/db/formats/pe/dupsec
@@ -1,6 +1,5 @@
 NAME=PE: corkami dupsec.exe - open
 FILE=bins/pe/dupsec.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/exceptions b/test/db/formats/pe/exceptions
index db247ef72fd..37073e6e772 100644
--- a/test/db/formats/pe/exceptions
+++ b/test/db/formats/pe/exceptions
@@ -1,6 +1,5 @@
 NAME=PE: corkami exceptions.exe - open
 FILE=bins/pe/exceptions.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/exportobf b/test/db/formats/pe/exportobf
index 4144473dd5d..a8b80c07c8b 100644
--- a/test/db/formats/pe/exportobf
+++ b/test/db/formats/pe/exportobf
@@ -1,6 +1,5 @@
 NAME=PE: corkami exportobf.exe - open
 FILE=bins/pe/exportobf.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/exports_doc b/test/db/formats/pe/exports_doc
index 2bf2a0455b2..f90f27eeebf 100644
--- a/test/db/formats/pe/exports_doc
+++ b/test/db/formats/pe/exports_doc
@@ -1,6 +1,5 @@
 NAME=PE: corkami exports_doc.exe - open
 FILE=bins/pe/exports_doc.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/exports_order b/test/db/formats/pe/exports_order
index 05bc6c4517e..19df5bc0e97 100644
--- a/test/db/formats/pe/exports_order
+++ b/test/db/formats/pe/exports_order
@@ -1,6 +1,5 @@
 NAME=PE: corkami exports_order.exe - open
 FILE=bins/pe/exports_order.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/exportsdata b/test/db/formats/pe/exportsdata
index 71fc471f79e..46e1a3bc98d 100644
--- a/test/db/formats/pe/exportsdata
+++ b/test/db/formats/pe/exportsdata
@@ -1,6 +1,5 @@
 NAME=PE: corkami exportsdata.exe - open
 FILE=bins/pe/exportsdata.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/fakenet b/test/db/formats/pe/fakenet
index cc64292bc86..00df8390d8d 100644
--- a/test/db/formats/pe/fakenet
+++ b/test/db/formats/pe/fakenet
@@ -1,6 +1,5 @@
 NAME=PE: corkami fakenet.exe - open
 FILE=bins/pe/fakenet.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/fakeregs b/test/db/formats/pe/fakeregs
index 8e1d884daeb..e1287b97078 100644
--- a/test/db/formats/pe/fakeregs
+++ b/test/db/formats/pe/fakeregs
@@ -1,6 +1,5 @@
 NAME=PE: corkami fakeregs.exe - open
 FILE=bins/pe/fakeregs.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/fakeregslib b/test/db/formats/pe/fakeregslib
index 05992de9f5d..2cecb4b22f6 100644
--- a/test/db/formats/pe/fakeregslib
+++ b/test/db/formats/pe/fakeregslib
@@ -1,6 +1,5 @@
 NAME=PE: corkami fakeregslib.dll - open
 FILE=bins/pe/fakeregslib.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/fakerelocs b/test/db/formats/pe/fakerelocs
index dd4932192d7..c5a66732553 100644
--- a/test/db/formats/pe/fakerelocs
+++ b/test/db/formats/pe/fakerelocs
@@ -1,6 +1,5 @@
 NAME=PE: corkami fakerelocs.exe - open
 FILE=bins/pe/fakerelocs.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/foldedhdr b/test/db/formats/pe/foldedhdr
index 46a83382f22..e704fdfb35f 100644
--- a/test/db/formats/pe/foldedhdr
+++ b/test/db/formats/pe/foldedhdr
@@ -1,6 +1,5 @@
 NAME=PE: corkami foldedhdr.exe - open
 FILE=bins/pe/foldedhdr.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/foldedhdrW7 b/test/db/formats/pe/foldedhdrW7
index 041c322ab82..cd702a2c0d2 100644
--- a/test/db/formats/pe/foldedhdrW7
+++ b/test/db/formats/pe/foldedhdrW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami foldedhdrW7.exe - open
 FILE=bins/pe/foldedhdrW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/footer b/test/db/formats/pe/footer
index 36ef5418df2..6192a28f704 100644
--- a/test/db/formats/pe/footer
+++ b/test/db/formats/pe/footer
@@ -1,6 +1,5 @@
 NAME=PE: corkami footer.exe - open
 FILE=bins/pe/footer.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/gui b/test/db/formats/pe/gui
index c2ecc56e06e..a3ced9ed1e9 100644
--- a/test/db/formats/pe/gui
+++ b/test/db/formats/pe/gui
@@ -1,6 +1,5 @@
 NAME=PE: corkami gui.exe - open
 FILE=bins/pe/gui.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/hard_imports b/test/db/formats/pe/hard_imports
index 85d1fcdc7d4..0e8b0b1c600 100644
--- a/test/db/formats/pe/hard_imports
+++ b/test/db/formats/pe/hard_imports
@@ -1,6 +1,5 @@
 NAME=PE: corkami hard_imports.exe - open
 FILE=bins/pe/hard_imports.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/hdrcode b/test/db/formats/pe/hdrcode
index 4fdd203f40a..63028c4ae19 100644
--- a/test/db/formats/pe/hdrcode
+++ b/test/db/formats/pe/hdrcode
@@ -1,6 +1,5 @@
 NAME=PE: corkami hdrcode.exe - open
 FILE=bins/pe/hdrcode.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/hdrdata b/test/db/formats/pe/hdrdata
index 8d632ee99e9..96f45f845c7 100644
--- a/test/db/formats/pe/hdrdata
+++ b/test/db/formats/pe/hdrdata
@@ -1,6 +1,5 @@
 NAME=PE: corkami hdrdata.exe - open
 FILE=bins/pe/hdrdata.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/hello_o b/test/db/formats/pe/hello_o
index d9ebe43b98d..856da8fe797 100644
--- a/test/db/formats/pe/hello_o
+++ b/test/db/formats/pe/hello_o
@@ -1,6 +1,5 @@
 NAME=COFF: hello object file
 FILE=bins/pe/hello.obj
 CMDS=q
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/hiddenappdata1 b/test/db/formats/pe/hiddenappdata1
index eb5de040f11..e599c0be789 100644
--- a/test/db/formats/pe/hiddenappdata1
+++ b/test/db/formats/pe/hiddenappdata1
@@ -1,6 +1,5 @@
 NAME=PE: corkami hiddenappdata1.exe - open
 FILE=bins/pe/hiddenappdata1.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/hiddenappdata2 b/test/db/formats/pe/hiddenappdata2
index a5a761b94bf..47f1ed30ac5 100644
--- a/test/db/formats/pe/hiddenappdata2
+++ b/test/db/formats/pe/hiddenappdata2
@@ -1,6 +1,5 @@
 NAME=PE: corkami hiddenappdata2.exe - open
 FILE=bins/pe/hiddenappdata2.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ibkernel b/test/db/formats/pe/ibkernel
index 374be4a0b05..b6e565157be 100644
--- a/test/db/formats/pe/ibkernel
+++ b/test/db/formats/pe/ibkernel
@@ -1,6 +1,5 @@
 NAME=PE: corkami ibkernel.exe - open
 FILE=bins/pe/ibkernel.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ibkmanual b/test/db/formats/pe/ibkmanual
index 63af99c98b5..a958a0d0941 100644
--- a/test/db/formats/pe/ibkmanual
+++ b/test/db/formats/pe/ibkmanual
@@ -1,6 +1,5 @@
 NAME=PE: corkami ibkmanual.exe - open
 FILE=bins/pe/ibkmanual.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ibknoreloc64 b/test/db/formats/pe/ibknoreloc64
index 4915d9360e8..4cfaa9bcdb9 100644
--- a/test/db/formats/pe/ibknoreloc64
+++ b/test/db/formats/pe/ibknoreloc64
@@ -1,6 +1,5 @@
 NAME=PE: corkami ibknoreloc64.exe - open
 FILE=bins/pe/ibknoreloc64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ibnullXP b/test/db/formats/pe/ibnullXP
index 4fe9626b3e4..88456f0d4fe 100644
--- a/test/db/formats/pe/ibnullXP
+++ b/test/db/formats/pe/ibnullXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami ibnullXP.exe - open
 FILE=bins/pe/ibnullXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ibreloc b/test/db/formats/pe/ibreloc
index 6eb8c943d03..b80b7a7ce67 100644
--- a/test/db/formats/pe/ibreloc
+++ b/test/db/formats/pe/ibreloc
@@ -1,6 +1,5 @@
 NAME=PE: corkami ibreloc.exe - open
 FILE=bins/pe/ibreloc.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ibrelocW7 b/test/db/formats/pe/ibrelocW7
index 8c79b0e4c4d..27bfffbf971 100644
--- a/test/db/formats/pe/ibrelocW7
+++ b/test/db/formats/pe/ibrelocW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami ibrelocW7.exe - open
 FILE=bins/pe/ibrelocW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/impbyord b/test/db/formats/pe/impbyord
index ca2f3ebb131..ab618b8db70 100644
--- a/test/db/formats/pe/impbyord
+++ b/test/db/formats/pe/impbyord
@@ -1,6 +1,5 @@
 NAME=PE: corkami impbyord.exe - open
 FILE=bins/pe/impbyord.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_apimsW7 b/test/db/formats/pe/imports_apimsW7
index bcfc53c68f7..8c2cc57f780 100644
--- a/test/db/formats/pe/imports_apimsW7
+++ b/test/db/formats/pe/imports_apimsW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_apimsW7.exe - open
 FILE=bins/pe/imports_apimsW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_badterm b/test/db/formats/pe/imports_badterm
index 88f23da1f84..83eae8b6dbc 100644
--- a/test/db/formats/pe/imports_badterm
+++ b/test/db/formats/pe/imports_badterm
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_badterm.exe - open
 FILE=bins/pe/imports_badterm.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_bogusIAT b/test/db/formats/pe/imports_bogusIAT
index aea5c5ce439..abe05bc1958 100644
--- a/test/db/formats/pe/imports_bogusIAT
+++ b/test/db/formats/pe/imports_bogusIAT
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_bogusIAT.exe - open
 FILE=bins/pe/imports_bogusIAT.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_corruptedIAT b/test/db/formats/pe/imports_corruptedIAT
index c50ee09bb72..078beed93dc 100644
--- a/test/db/formats/pe/imports_corruptedIAT
+++ b/test/db/formats/pe/imports_corruptedIAT
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_corruptedIAT.exe - open
 FILE=bins/pe/imports_corruptedIAT.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_iatindesc b/test/db/formats/pe/imports_iatindesc
index b82b1fa43dd..6fb0d6d1e60 100644
--- a/test/db/formats/pe/imports_iatindesc
+++ b/test/db/formats/pe/imports_iatindesc
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_iatindesc.exe - open
 FILE=bins/pe/imports_iatindesc.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_mixed b/test/db/formats/pe/imports_mixed
index 3441dc54c1e..521fa0071bf 100644
--- a/test/db/formats/pe/imports_mixed
+++ b/test/db/formats/pe/imports_mixed
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_mixed.exe - open
 FILE=bins/pe/imports_mixed.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_multidesc b/test/db/formats/pe/imports_multidesc
index 85d8fee15dd..d616ed86c60 100644
--- a/test/db/formats/pe/imports_multidesc
+++ b/test/db/formats/pe/imports_multidesc
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_multidesc.exe - open
 FILE=bins/pe/imports_multidesc.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_nnIAT b/test/db/formats/pe/imports_nnIAT
index 69ced42ec6b..49ea37483f7 100644
--- a/test/db/formats/pe/imports_nnIAT
+++ b/test/db/formats/pe/imports_nnIAT
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_nnIAT.exe - open
 FILE=bins/pe/imports_nnIAT.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_noext b/test/db/formats/pe/imports_noext
index 3b374bd9061..bcd5859e861 100644
--- a/test/db/formats/pe/imports_noext
+++ b/test/db/formats/pe/imports_noext
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_noext.exe - open
 FILE=bins/pe/imports_noext.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_noint b/test/db/formats/pe/imports_noint
index 5715bde3864..bf108c6791f 100644
--- a/test/db/formats/pe/imports_noint
+++ b/test/db/formats/pe/imports_noint
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_noint.exe - open
 FILE=bins/pe/imports_noint.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_nothunk b/test/db/formats/pe/imports_nothunk
index b388f61d9ac..fc456f4df5f 100644
--- a/test/db/formats/pe/imports_nothunk
+++ b/test/db/formats/pe/imports_nothunk
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_nothunk.exe - open
 FILE=bins/pe/imports_nothunk.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_relocW7 b/test/db/formats/pe/imports_relocW7
index d10f8414fd5..6d3025f9f36 100644
--- a/test/db/formats/pe/imports_relocW7
+++ b/test/db/formats/pe/imports_relocW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_relocW7.exe - open
 FILE=bins/pe/imports_relocW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_tinyW7 b/test/db/formats/pe/imports_tinyW7
index 99ac92fe1eb..f08a70f9ea3 100644
--- a/test/db/formats/pe/imports_tinyW7
+++ b/test/db/formats/pe/imports_tinyW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_tinyW7.exe - open
 FILE=bins/pe/imports_tinyW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_tinyXP b/test/db/formats/pe/imports_tinyXP
index 8b5cded6d7e..d78cf637d29 100644
--- a/test/db/formats/pe/imports_tinyXP
+++ b/test/db/formats/pe/imports_tinyXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_tinyXP.exe - open
 FILE=bins/pe/imports_tinyXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_virtdesc b/test/db/formats/pe/imports_virtdesc
index 31281882bbe..4261dce6727 100644
--- a/test/db/formats/pe/imports_virtdesc
+++ b/test/db/formats/pe/imports_virtdesc
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_virtdesc.exe - open
 FILE=bins/pe/imports_virtdesc.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/imports_vterm b/test/db/formats/pe/imports_vterm
index 96f97dc9466..2c280bd0eb0 100644
--- a/test/db/formats/pe/imports_vterm
+++ b/test/db/formats/pe/imports_vterm
@@ -1,6 +1,5 @@
 NAME=PE: corkami imports_vterm.exe - open
 FILE=bins/pe/imports_vterm.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/importsdotXP b/test/db/formats/pe/importsdotXP
index 73f07f04632..f27b06912fb 100644
--- a/test/db/formats/pe/importsdotXP
+++ b/test/db/formats/pe/importsdotXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami importsdotXP.exe - open
 FILE=bins/pe/importsdotXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/importshint b/test/db/formats/pe/importshint
index 0168c322590..b716da3132d 100644
--- a/test/db/formats/pe/importshint
+++ b/test/db/formats/pe/importshint
@@ -1,6 +1,5 @@
 NAME=PE: corkami importshint.exe - open
 FILE=bins/pe/importshint.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/jman b/test/db/formats/pe/jman
index 259df700793..b710ad84fcf 100644
--- a/test/db/formats/pe/jman
+++ b/test/db/formats/pe/jman
@@ -1,8 +1,7 @@
 NAME=MZ: jman.exe - open
 FILE=bins/pe/jman.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=MZ: jman.exe - entrypoint
diff --git a/test/db/formats/pe/ldrsnaps b/test/db/formats/pe/ldrsnaps
index 659e29fc836..903f6f11d8c 100644
--- a/test/db/formats/pe/ldrsnaps
+++ b/test/db/formats/pe/ldrsnaps
@@ -1,6 +1,5 @@
 NAME=PE: corkami ldrsnaps.exe - open
 FILE=bins/pe/ldrsnaps.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ldrsnaps64 b/test/db/formats/pe/ldrsnaps64
index 396dd41cf71..778de0f448a 100644
--- a/test/db/formats/pe/ldrsnaps64
+++ b/test/db/formats/pe/ldrsnaps64
@@ -1,6 +1,5 @@
 NAME=PE: corkami ldrsnaps64.exe - open
 FILE=bins/pe/ldrsnaps64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/lfanew_relocW7 b/test/db/formats/pe/lfanew_relocW7
index 5215b50b51e..c9a66776098 100644
--- a/test/db/formats/pe/lfanew_relocW7
+++ b/test/db/formats/pe/lfanew_relocW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami lfanew_relocW7.exe - open
 FILE=bins/pe/lfanew_relocW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/lfanew_relocXP b/test/db/formats/pe/lfanew_relocXP
index 02cdcbb4722..38ae44700a5 100644
--- a/test/db/formats/pe/lfanew_relocXP
+++ b/test/db/formats/pe/lfanew_relocXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami lfanew_relocXP.exe - open
 FILE=bins/pe/lfanew_relocXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/lowsubsys b/test/db/formats/pe/lowsubsys
index f70598958d5..bd86796eb22 100644
--- a/test/db/formats/pe/lowsubsys
+++ b/test/db/formats/pe/lowsubsys
@@ -1,6 +1,5 @@
 NAME=PE: corkami lowsubsys.exe - open
 FILE=bins/pe/lowsubsys.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/manifest b/test/db/formats/pe/manifest
index a7b0788f800..4421e869eeb 100644
--- a/test/db/formats/pe/manifest
+++ b/test/db/formats/pe/manifest
@@ -1,6 +1,5 @@
 NAME=PE: corkami manifest.exe - open
 FILE=bins/pe/manifest.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/manifest_broken b/test/db/formats/pe/manifest_broken
index 6181c36cddc..962dbff83c3 100644
--- a/test/db/formats/pe/manifest_broken
+++ b/test/db/formats/pe/manifest_broken
@@ -1,6 +1,5 @@
 NAME=PE: corkami manifest_broken.exe - open
 FILE=bins/pe/manifest_broken.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/manifest_bsod b/test/db/formats/pe/manifest_bsod
index edfc3045fb2..e79c50a57ef 100644
--- a/test/db/formats/pe/manifest_bsod
+++ b/test/db/formats/pe/manifest_bsod
@@ -1,6 +1,5 @@
 NAME=PE: corkami manifest_bsod.exe - open
 FILE=bins/pe/manifest_bsod.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/manyimportsW7 b/test/db/formats/pe/manyimportsW7
index e64fb531988..053acb68b8e 100644
--- a/test/db/formats/pe/manyimportsW7
+++ b/test/db/formats/pe/manyimportsW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami manyimportsW7.exe - open
 FILE=bins/pe/manyimportsW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/maxsecXP b/test/db/formats/pe/maxsecXP
index c76eabce875..42b0b757e98 100644
--- a/test/db/formats/pe/maxsecXP
+++ b/test/db/formats/pe/maxsecXP
@@ -2,7 +2,6 @@ NAME=PE: corkami maxsecXP.exe - open
 FILE=bins/pe/maxsecXP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 BROKEN=1
 RUN
diff --git a/test/db/formats/pe/maxsec_lowaligW7 b/test/db/formats/pe/maxsec_lowaligW7
index 394517549ec..91364c6dcf6 100644
--- a/test/db/formats/pe/maxsec_lowaligW7
+++ b/test/db/formats/pe/maxsec_lowaligW7
@@ -2,6 +2,5 @@ NAME=PE: corkami maxsec_lowaligW7.exe - open
 FILE=bins/pe/maxsec_lowaligW7.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/maxvals b/test/db/formats/pe/maxvals
index 57b3157b381..7b789ab760d 100644
--- a/test/db/formats/pe/maxvals
+++ b/test/db/formats/pe/maxvals
@@ -2,6 +2,5 @@ NAME=PE: corkami maxvals.exe - open
 FILE=bins/pe/maxvals.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/memshared b/test/db/formats/pe/memshared
index 8529b5d6263..868730c05d6 100644
--- a/test/db/formats/pe/memshared
+++ b/test/db/formats/pe/memshared
@@ -1,6 +1,5 @@
 NAME=PE: corkami memshared.dll - open
 FILE=bins/pe/memshared.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/memshared-ld b/test/db/formats/pe/memshared-ld
index d86136a2531..7c64b207a62 100644
--- a/test/db/formats/pe/memshared-ld
+++ b/test/db/formats/pe/memshared-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami memshared-ld.exe - open
 FILE=bins/pe/memshared-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/mini b/test/db/formats/pe/mini
index d67ce0a1963..5a4d78b9543 100644
--- a/test/db/formats/pe/mini
+++ b/test/db/formats/pe/mini
@@ -1,6 +1,5 @@
 NAME=PE: corkami mini.exe - open
 FILE=bins/pe/mini.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/mscoree b/test/db/formats/pe/mscoree
index da852fa4c52..bfbbe623307 100644
--- a/test/db/formats/pe/mscoree
+++ b/test/db/formats/pe/mscoree
@@ -1,6 +1,5 @@
 NAME=PE: corkami mscoree.exe - open
 FILE=bins/pe/mscoree.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/multiss b/test/db/formats/pe/multiss
index 97595676217..b35dd07b533 100644
--- a/test/db/formats/pe/multiss
+++ b/test/db/formats/pe/multiss
@@ -1,6 +1,5 @@
 NAME=PE: corkami multiss.exe - open
 FILE=bins/pe/multiss.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/multiss_con b/test/db/formats/pe/multiss_con
index 99b2d05b063..ae5f858e1ec 100644
--- a/test/db/formats/pe/multiss_con
+++ b/test/db/formats/pe/multiss_con
@@ -1,6 +1,5 @@
 NAME=PE: corkami multiss_con.exe - open
 FILE=bins/pe/multiss_con.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/multiss_drv b/test/db/formats/pe/multiss_drv
index f315b4430cd..0d7bdaed431 100644
--- a/test/db/formats/pe/multiss_drv
+++ b/test/db/formats/pe/multiss_drv
@@ -1,6 +1,5 @@
 NAME=PE: corkami multiss_drv.sys - open
 FILE=bins/pe/multiss_drv.sys
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/multiss_gui b/test/db/formats/pe/multiss_gui
index 7eb57414d2c..6144d9445d0 100644
--- a/test/db/formats/pe/multiss_gui
+++ b/test/db/formats/pe/multiss_gui
@@ -1,6 +1,5 @@
 NAME=PE: corkami multiss_gui.exe - open
 FILE=bins/pe/multiss_gui.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/mz b/test/db/formats/pe/mz
index ad59983ba93..b70e68ab130 100644
--- a/test/db/formats/pe/mz
+++ b/test/db/formats/pe/mz
@@ -1,8 +1,7 @@
 NAME=PE: corkami mz.exe - open
 FILE=bins/pe/mz.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami mz.exe - dis
diff --git a/test/db/formats/pe/namedresource b/test/db/formats/pe/namedresource
index f7e103b8e8d..181455e75c3 100644
--- a/test/db/formats/pe/namedresource
+++ b/test/db/formats/pe/namedresource
@@ -1,6 +1,5 @@
 NAME=PE: corkami namedresource.exe - open
 FILE=bins/pe/namedresource.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/no0code b/test/db/formats/pe/no0code
index 4551ddc1109..74a83152c14 100644
--- a/test/db/formats/pe/no0code
+++ b/test/db/formats/pe/no0code
@@ -1,6 +1,5 @@
 NAME=PE: corkami no0code.exe - open
 FILE=bins/pe/no0code.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/no_dd b/test/db/formats/pe/no_dd
index 581e83c98f6..8b56d16f3fb 100644
--- a/test/db/formats/pe/no_dd
+++ b/test/db/formats/pe/no_dd
@@ -1,6 +1,5 @@
 NAME=PE: corkami no_dd.exe - open
 FILE=bins/pe/no_dd.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/no_dd64 b/test/db/formats/pe/no_dd64
index b65221b7897..6d6fe702077 100644
--- a/test/db/formats/pe/no_dd64
+++ b/test/db/formats/pe/no_dd64
@@ -1,6 +1,5 @@
 NAME=PE: corkami no_dd64.exe - open
 FILE=bins/pe/no_dd64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/no_dep b/test/db/formats/pe/no_dep
index f5252e10c49..fdfbc645563 100644
--- a/test/db/formats/pe/no_dep
+++ b/test/db/formats/pe/no_dep
@@ -1,8 +1,7 @@
 NAME=PE: corkami dep.exe - open
 FILE=bins/pe/dep.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=1: PE: corkami dep.exe - dep not enabled
diff --git a/test/db/formats/pe/no_seh b/test/db/formats/pe/no_seh
index 59cc43b1b80..8b233a1ee10 100644
--- a/test/db/formats/pe/no_seh
+++ b/test/db/formats/pe/no_seh
@@ -1,6 +1,5 @@
 NAME=PE: corkami no_seh.exe - open
 FILE=bins/pe/no_seh.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/normal b/test/db/formats/pe/normal
index 4e27d33de23..85f844cccba 100644
--- a/test/db/formats/pe/normal
+++ b/test/db/formats/pe/normal
@@ -1,8 +1,7 @@
 NAME=PE: corkami normal.exe - open
 FILE=bins/pe/normal.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami normal.exe - bits 32
diff --git a/test/db/formats/pe/normal64 b/test/db/formats/pe/normal64
index bc145f96094..8dbd6045122 100644
--- a/test/db/formats/pe/normal64
+++ b/test/db/formats/pe/normal64
@@ -1,8 +1,7 @@
 NAME=PE: corkami normal64.exe - open
 FILE=bins/pe/normal64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami normal64.exe - bits 64
diff --git a/test/db/formats/pe/nosectionW7 b/test/db/formats/pe/nosectionW7
index 56ab5a8dd57..b1ea96d4f65 100644
--- a/test/db/formats/pe/nosectionW7
+++ b/test/db/formats/pe/nosectionW7
@@ -1,8 +1,7 @@
 NAME=PE: corkami nosectionW7.exe - open
 FILE=bins/pe/nosectionW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=1: PE: nosectionW7 - entrypoint
diff --git a/test/db/formats/pe/nosectionXP b/test/db/formats/pe/nosectionXP
index a8b9da5cff5..d9e412cfa8a 100644
--- a/test/db/formats/pe/nosectionXP
+++ b/test/db/formats/pe/nosectionXP
@@ -1,8 +1,7 @@
 NAME=PE: corkami nosectionXP.exe - open
 FILE=bins/pe/nosectionXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: nosectionXP - section
diff --git a/test/db/formats/pe/nothing b/test/db/formats/pe/nothing
index 03d4621c342..f03a2cf5a6b 100644
--- a/test/db/formats/pe/nothing
+++ b/test/db/formats/pe/nothing
@@ -1,6 +1,5 @@
 NAME=PE: corkami nothing.dll - open
 FILE=bins/pe/nothing.dll
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/nothing-ld b/test/db/formats/pe/nothing-ld
index 2e123df45c1..104da735de4 100644
--- a/test/db/formats/pe/nothing-ld
+++ b/test/db/formats/pe/nothing-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami nothing-ld.exe - open
 FILE=bins/pe/nothing-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/nullEP b/test/db/formats/pe/nullEP
index 2ae7a4834d1..2fd68178f41 100644
--- a/test/db/formats/pe/nullEP
+++ b/test/db/formats/pe/nullEP
@@ -1,8 +1,7 @@
 NAME=PE: corkami nullEP.exe - open
 FILE=bins/pe/nullEP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami nullEP.exe - pi 1
@@ -16,6 +15,5 @@ RUN
 NAME=PE: corkami nullEP.exe - Expect error Null entry
 FILE=bins/pe/nullEP.exe
 CMDS=q
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/nullSOH-XP b/test/db/formats/pe/nullSOH-XP
index 3b79f173ac2..54133c77c47 100644
--- a/test/db/formats/pe/nullSOH-XP
+++ b/test/db/formats/pe/nullSOH-XP
@@ -1,6 +1,5 @@
 NAME=PE: corkami nullSOH-XP.exe - open
 FILE=bins/pe/nullSOH-XP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/nullvirt b/test/db/formats/pe/nullvirt
index 37b7100a961..c4b650db5f1 100644
--- a/test/db/formats/pe/nullvirt
+++ b/test/db/formats/pe/nullvirt
@@ -1,6 +1,5 @@
 NAME=PE: corkami nullvirt.exe - open
 FILE=bins/pe/nullvirt.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ownexports b/test/db/formats/pe/ownexports
index 7c47eb8b445..4a13e6e3d12 100644
--- a/test/db/formats/pe/ownexports
+++ b/test/db/formats/pe/ownexports
@@ -1,6 +1,5 @@
 NAME=PE: corkami ownexports.exe - open
 FILE=bins/pe/ownexports.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ownexports2 b/test/db/formats/pe/ownexports2
index 1e565b3564c..e8f5f42a562 100644
--- a/test/db/formats/pe/ownexports2
+++ b/test/db/formats/pe/ownexports2
@@ -1,6 +1,5 @@
 NAME=PE: corkami ownexports2.exe - open
 FILE=bins/pe/ownexports2.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ownexportsdot b/test/db/formats/pe/ownexportsdot
index cdb1d24c674..2f8fd776361 100644
--- a/test/db/formats/pe/ownexportsdot
+++ b/test/db/formats/pe/ownexportsdot
@@ -1,6 +1,5 @@
 NAME=PE: corkami ownexportsdot.exe - open
 FILE=bins/pe/ownexportsdot.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/pdf b/test/db/formats/pe/pdf
index 967758f939d..e226c01a68c 100644
--- a/test/db/formats/pe/pdf
+++ b/test/db/formats/pe/pdf
@@ -1,6 +1,5 @@
 NAME=PE: corkami pdf.exe - open
 FILE=bins/pe/pdf.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/pdf_zip_pe b/test/db/formats/pe/pdf_zip_pe
index dd0bd604072..281c364e13a 100644
--- a/test/db/formats/pe/pdf_zip_pe
+++ b/test/db/formats/pe/pdf_zip_pe
@@ -1,6 +1,5 @@
 NAME=PE: corkami pdf_zip_pe.exe - open
 FILE=bins/pe/pdf_zip_pe.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/pe b/test/db/formats/pe/pe
index 2ff8c8fe510..92fa9b13107 100644
--- a/test/db/formats/pe/pe
+++ b/test/db/formats/pe/pe
@@ -30,8 +30,7 @@ e asm.functions=false
 e asm.flags=false
 pd 1@0x401820~!imp
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=pe relocs [rz-bin x.dll]
diff --git a/test/db/formats/pe/pe32 b/test/db/formats/pe/pe32
index 79b57818732..517ae58f872 100644
--- a/test/db/formats/pe/pe32
+++ b/test/db/formats/pe/pe32
@@ -9,6 +9,5 @@ RUN
 NAME=./pe32
 FILE=bins/pe/vista-glass.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/quine b/test/db/formats/pe/quine
index 26dac89a540..d1818adfefe 100644
--- a/test/db/formats/pe/quine
+++ b/test/db/formats/pe/quine
@@ -1,6 +1,5 @@
 NAME=PE: corkami quine.exe - open
 FILE=bins/pe/quine.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/reloc4 b/test/db/formats/pe/reloc4
index 78985dcf728..72458e762c1 100644
--- a/test/db/formats/pe/reloc4
+++ b/test/db/formats/pe/reloc4
@@ -1,6 +1,5 @@
 NAME=PE: corkami reloc4.exe - open
 FILE=bins/pe/reloc4.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/reloc9 b/test/db/formats/pe/reloc9
index deb35fa323c..272af087688 100644
--- a/test/db/formats/pe/reloc9
+++ b/test/db/formats/pe/reloc9
@@ -1,6 +1,5 @@
 NAME=PE: corkami reloc9.exe - open
 FILE=bins/pe/reloc9.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/relocOSdet b/test/db/formats/pe/relocOSdet
index 990a6a149f4..7744ab105e1 100644
--- a/test/db/formats/pe/relocOSdet
+++ b/test/db/formats/pe/relocOSdet
@@ -1,6 +1,5 @@
 NAME=PE: corkami relocOSdet.exe - open
 FILE=bins/pe/relocOSdet.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/reloccrypt b/test/db/formats/pe/reloccrypt
index a59adae4f8e..be1902690e4 100644
--- a/test/db/formats/pe/reloccrypt
+++ b/test/db/formats/pe/reloccrypt
@@ -1,6 +1,5 @@
 NAME=PE: corkami reloccrypt.exe - open
 FILE=bins/pe/reloccrypt.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/reloccryptW8 b/test/db/formats/pe/reloccryptW8
index 348c5037d96..45fdd776e3b 100644
--- a/test/db/formats/pe/reloccryptW8
+++ b/test/db/formats/pe/reloccryptW8
@@ -1,6 +1,5 @@
 NAME=PE: corkami reloccryptW8.exe - open
 FILE=bins/pe/reloccryptW8.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/reloccryptXP b/test/db/formats/pe/reloccryptXP
index 87317c7d3ea..5be22c787dc 100644
--- a/test/db/formats/pe/reloccryptXP
+++ b/test/db/formats/pe/reloccryptXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami reloccryptXP.exe - open
 FILE=bins/pe/reloccryptXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/relocsstripped b/test/db/formats/pe/relocsstripped
index 04198102d8c..1dc89194908 100644
--- a/test/db/formats/pe/relocsstripped
+++ b/test/db/formats/pe/relocsstripped
@@ -1,6 +1,5 @@
 NAME=PE: corkami relocsstripped.exe - open
 FILE=bins/pe/relocsstripped.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/relocsstripped64 b/test/db/formats/pe/relocsstripped64
index 4ec497b6af5..5ec32d69392 100644
--- a/test/db/formats/pe/relocsstripped64
+++ b/test/db/formats/pe/relocsstripped64
@@ -1,6 +1,5 @@
 NAME=PE: corkami relocsstripped64.exe - open
 FILE=bins/pe/relocsstripped64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/reshdr b/test/db/formats/pe/reshdr
index 6abaf784c86..ba6e6af52a2 100644
--- a/test/db/formats/pe/reshdr
+++ b/test/db/formats/pe/reshdr
@@ -1,6 +1,5 @@
 NAME=PE: corkami reshdr.exe - open
 FILE=bins/pe/reshdr.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/safeseh b/test/db/formats/pe/safeseh
index 529e7aedf4e..9e8ce6bee84 100644
--- a/test/db/formats/pe/safeseh
+++ b/test/db/formats/pe/safeseh
@@ -1,6 +1,5 @@
 NAME=PE: corkami safeseh.exe - open
 FILE=bins/pe/safeseh.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/safeseh_fly b/test/db/formats/pe/safeseh_fly
index eeb94ba9a48..c4ebcea4b73 100644
--- a/test/db/formats/pe/safeseh_fly
+++ b/test/db/formats/pe/safeseh_fly
@@ -1,6 +1,5 @@
 NAME=PE: corkami safeseh_fly.exe - open
 FILE=bins/pe/safeseh_fly.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/sc b/test/db/formats/pe/sc
index ccf1b80db92..4f264867934 100644
--- a/test/db/formats/pe/sc
+++ b/test/db/formats/pe/sc
@@ -1,6 +1,5 @@
 NAME=PE: corkami sc.exe - open
 FILE=bins/pe/sc.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/sectiondata b/test/db/formats/pe/sectiondata
index 3fcb96a309b..55f05fbeadc 100644
--- a/test/db/formats/pe/sectiondata
+++ b/test/db/formats/pe/sectiondata
@@ -1,8 +1,7 @@
 NAME=PE: corkami cm01.exe - open
 FILE=bins/pe/cm01.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami cm01.exe - sections
diff --git a/test/db/formats/pe/seh_change64 b/test/db/formats/pe/seh_change64
index a1e9d9287d4..ac65c343fb1 100644
--- a/test/db/formats/pe/seh_change64
+++ b/test/db/formats/pe/seh_change64
@@ -1,6 +1,5 @@
 NAME=PE: corkami seh_change64.exe - open
 FILE=bins/pe/seh_change64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/seh_x64 b/test/db/formats/pe/seh_x64
index 595860a4900..8b9d4701e9a 100644
--- a/test/db/formats/pe/seh_x64
+++ b/test/db/formats/pe/seh_x64
@@ -1,8 +1,7 @@
 NAME=PE: seh_x64.exe - open
 FILE=bins/pe/seh_x64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: seh_x64.exe - Get trycatchs
diff --git a/test/db/formats/pe/shuffledsect b/test/db/formats/pe/shuffledsect
index 7a5a9c6f548..78b3b56a89d 100644
--- a/test/db/formats/pe/shuffledsect
+++ b/test/db/formats/pe/shuffledsect
@@ -1,6 +1,5 @@
 NAME=PE: corkami shuffledsect.exe - open
 FILE=bins/pe/shuffledsect.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/signature b/test/db/formats/pe/signature
index c11228b6fbe..bcc63170a7f 100644
--- a/test/db/formats/pe/signature
+++ b/test/db/formats/pe/signature
@@ -1,6 +1,5 @@
 NAME=PE: corkami signature.exe - open
 FILE=bins/pe/signature.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/skippeddynbase b/test/db/formats/pe/skippeddynbase
index cc4bc4a8262..7fee3b402e7 100644
--- a/test/db/formats/pe/skippeddynbase
+++ b/test/db/formats/pe/skippeddynbase
@@ -1,6 +1,5 @@
 NAME=PE: corkami skippeddynbase.exe - open
 FILE=bins/pe/skippeddynbase.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/slackspace b/test/db/formats/pe/slackspace
index c7497a28d7e..909697ebecc 100644
--- a/test/db/formats/pe/slackspace
+++ b/test/db/formats/pe/slackspace
@@ -1,6 +1,5 @@
 NAME=PE: corkami slackspace.exe - open
 FILE=bins/pe/slackspace.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ss63 b/test/db/formats/pe/ss63
index 4e91b749fca..108b2f5fe07 100644
--- a/test/db/formats/pe/ss63
+++ b/test/db/formats/pe/ss63
@@ -1,6 +1,5 @@
 NAME=PE: corkami ss63.exe - open
 FILE=bins/pe/ss63.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/ss63nocookie b/test/db/formats/pe/ss63nocookie
index 5ba7b401d54..86b90a6a027 100644
--- a/test/db/formats/pe/ss63nocookie
+++ b/test/db/formats/pe/ss63nocookie
@@ -1,6 +1,5 @@
 NAME=PE: corkami ss63nocookie.exe - open
 FILE=bins/pe/ss63nocookie.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/standard b/test/db/formats/pe/standard
index 7c38e01354d..2b7773314c1 100644
--- a/test/db/formats/pe/standard
+++ b/test/db/formats/pe/standard
@@ -1,6 +1,5 @@
 NAME=PE: corkami standard.exe - open
 FILE=bins/pe/standard.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tiny b/test/db/formats/pe/tiny
index 0ebc6260c4d..4f2e61c75f7 100644
--- a/test/db/formats/pe/tiny
+++ b/test/db/formats/pe/tiny
@@ -2,6 +2,5 @@ NAME=PE: corkami tiny.exe - open
 FILE=bins/pe/tiny.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinyW7 b/test/db/formats/pe/tinyW7
index 7c9220621b5..a327b842129 100644
--- a/test/db/formats/pe/tinyW7
+++ b/test/db/formats/pe/tinyW7
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinyW7.exe - open
 FILE=bins/pe/tinyW7.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinyW7_3264 b/test/db/formats/pe/tinyW7_3264
index 3a4571511df..a4a65bc90bc 100644
--- a/test/db/formats/pe/tinyW7_3264
+++ b/test/db/formats/pe/tinyW7_3264
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinyW7_3264.exe - open
 FILE=bins/pe/tinyW7_3264.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinyW7x64 b/test/db/formats/pe/tinyW7x64
index 0a7f1eb6a65..1a0aece48e9 100644
--- a/test/db/formats/pe/tinyW7x64
+++ b/test/db/formats/pe/tinyW7x64
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinyW7x64.exe - open
 FILE=bins/pe/tinyW7x64.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinyXP b/test/db/formats/pe/tinyXP
index 3b9103cc9d6..9b49e515ca5 100644
--- a/test/db/formats/pe/tinyXP
+++ b/test/db/formats/pe/tinyXP
@@ -2,6 +2,5 @@ NAME=PE: corkami tinyXP.exe - open
 FILE=bins/pe/tinyXP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinydll b/test/db/formats/pe/tinydll
index 54bf4a10558..7f40b12055e 100644
--- a/test/db/formats/pe/tinydll
+++ b/test/db/formats/pe/tinydll
@@ -2,6 +2,5 @@ NAME=PE: corkami tinydll.dll - open
 FILE=bins/pe/tinydll.dll
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinydll-ld b/test/db/formats/pe/tinydll-ld
index 410e09b2f6b..0d7131af397 100644
--- a/test/db/formats/pe/tinydll-ld
+++ b/test/db/formats/pe/tinydll-ld
@@ -2,6 +2,5 @@ NAME=PE: corkami tinydll-ld.exe - open
 FILE=bins/pe/tinydll-ld.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinydllXP b/test/db/formats/pe/tinydllXP
index 3b9103cc9d6..9b49e515ca5 100644
--- a/test/db/formats/pe/tinydllXP
+++ b/test/db/formats/pe/tinydllXP
@@ -2,6 +2,5 @@ NAME=PE: corkami tinyXP.exe - open
 FILE=bins/pe/tinyXP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinydllXP-ld b/test/db/formats/pe/tinydllXP-ld
index 40ca44dbed2..2937dafb8c7 100644
--- a/test/db/formats/pe/tinydllXP-ld
+++ b/test/db/formats/pe/tinydllXP-ld
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinydllXP-ld.exe - open
 FILE=bins/pe/tinydllXP-ld.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinydrivXP b/test/db/formats/pe/tinydrivXP
index bbbb78fbbbe..56f68ac655c 100644
--- a/test/db/formats/pe/tinydrivXP
+++ b/test/db/formats/pe/tinydrivXP
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinydrivXP.sys - open
 FILE=bins/pe/tinydrivXP.sys
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinygui b/test/db/formats/pe/tinygui
index 5ec7840b3c3..f51b2da2e89 100644
--- a/test/db/formats/pe/tinygui
+++ b/test/db/formats/pe/tinygui
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinygui.exe - open
 FILE=bins/pe/tinygui.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tinynet b/test/db/formats/pe/tinynet
index 656c3e3534a..cd129cc7dfb 100644
--- a/test/db/formats/pe/tinynet
+++ b/test/db/formats/pe/tinynet
@@ -1,6 +1,5 @@
 NAME=PE: corkami tinynet.exe - open
 FILE=bins/pe/tinynet.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls b/test/db/formats/pe/tls
index e283cf4cb78..2cfd79dcbdf 100644
--- a/test/db/formats/pe/tls
+++ b/test/db/formats/pe/tls
@@ -2,6 +2,5 @@ NAME=PE: corkami tls.exe - open
 FILE=bins/pe/tls.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls64 b/test/db/formats/pe/tls64
index 8ada170cee1..2a6587888ac 100644
--- a/test/db/formats/pe/tls64
+++ b/test/db/formats/pe/tls64
@@ -2,6 +2,5 @@ NAME=PE: corkami tls64.exe - open
 FILE=bins/pe/tls64.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_aoi b/test/db/formats/pe/tls_aoi
index 820f6c8be8e..f5eaeaabbd4 100644
--- a/test/db/formats/pe/tls_aoi
+++ b/test/db/formats/pe/tls_aoi
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_aoi.exe - open
 FILE=bins/pe/tls_aoi.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_aoiOSDET b/test/db/formats/pe/tls_aoiOSDET
index 77a8c783c18..bcc8894a307 100644
--- a/test/db/formats/pe/tls_aoiOSDET
+++ b/test/db/formats/pe/tls_aoiOSDET
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_aoiOSDET.exe - open
 FILE=bins/pe/tls_aoiOSDET.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_exiting b/test/db/formats/pe/tls_exiting
index 744998ddd6d..b56075b190f 100644
--- a/test/db/formats/pe/tls_exiting
+++ b/test/db/formats/pe/tls_exiting
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_exiting.exe - open
 FILE=bins/pe/tls_exiting.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_import b/test/db/formats/pe/tls_import
index 697b9597829..dcfd477e4dd 100644
--- a/test/db/formats/pe/tls_import
+++ b/test/db/formats/pe/tls_import
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_import.exe - open
 FILE=bins/pe/tls_import.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_k32 b/test/db/formats/pe/tls_k32
index 1c3ebddb584..b0ed7f42713 100644
--- a/test/db/formats/pe/tls_k32
+++ b/test/db/formats/pe/tls_k32
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_k32.exe - open
 FILE=bins/pe/tls_k32.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_noEP b/test/db/formats/pe/tls_noEP
index 27f3516f626..42bf805ffdf 100644
--- a/test/db/formats/pe/tls_noEP
+++ b/test/db/formats/pe/tls_noEP
@@ -2,8 +2,7 @@ NAME=PE: corkami tls_noEP.exe - open
 FILE=bins/pe/tls_noEP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=1: PE: tls_noEP - entrypoint
diff --git a/test/db/formats/pe/tls_obfuscation b/test/db/formats/pe/tls_obfuscation
index 9b622b24a86..ed4799a76a0 100644
--- a/test/db/formats/pe/tls_obfuscation
+++ b/test/db/formats/pe/tls_obfuscation
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_obfuscation.exe - open
 FILE=bins/pe/tls_obfuscation.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_onthefly b/test/db/formats/pe/tls_onthefly
index fd0a66588a7..5a157904018 100644
--- a/test/db/formats/pe/tls_onthefly
+++ b/test/db/formats/pe/tls_onthefly
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_onthefly.exe - open
 FILE=bins/pe/tls_onthefly.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_reloc b/test/db/formats/pe/tls_reloc
index e565767f5cb..c03cad9a286 100644
--- a/test/db/formats/pe/tls_reloc
+++ b/test/db/formats/pe/tls_reloc
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_reloc.exe - open
 FILE=bins/pe/tls_reloc.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/tls_virtEP b/test/db/formats/pe/tls_virtEP
index c9a4a5e2bfc..a74eb8dd0db 100644
--- a/test/db/formats/pe/tls_virtEP
+++ b/test/db/formats/pe/tls_virtEP
@@ -2,6 +2,5 @@ NAME=PE: corkami tls_virtEP.exe - open
 FILE=bins/pe/tls_virtEP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/truncatedlast b/test/db/formats/pe/truncatedlast
index 8a416470d60..9024c71e9ef 100644
--- a/test/db/formats/pe/truncatedlast
+++ b/test/db/formats/pe/truncatedlast
@@ -2,6 +2,5 @@ NAME=PE: corkami truncatedlast.exe - open
 FILE=bins/pe/truncatedlast.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/truncsectbl b/test/db/formats/pe/truncsectbl
index 59e62f2845f..dbfb63bfa7a 100644
--- a/test/db/formats/pe/truncsectbl
+++ b/test/db/formats/pe/truncsectbl
@@ -2,6 +2,5 @@ NAME=PE: corkami truncsectbl.exe - open
 FILE=bins/pe/truncsectbl.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/version_cust b/test/db/formats/pe/version_cust
index c2dfa6f6714..11b6f22819b 100644
--- a/test/db/formats/pe/version_cust
+++ b/test/db/formats/pe/version_cust
@@ -2,6 +2,5 @@ NAME=PE: corkami version_cust.exe - open
 FILE=bins/pe/version_cust.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/version_mini b/test/db/formats/pe/version_mini
index 0faa5d85ac3..8b9f74cc470 100644
--- a/test/db/formats/pe/version_mini
+++ b/test/db/formats/pe/version_mini
@@ -2,6 +2,5 @@ NAME=PE: corkami version_mini.exe - open
 FILE=bins/pe/version_mini.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/version_std b/test/db/formats/pe/version_std
index 36539d73377..7ca1c7c0dff 100644
--- a/test/db/formats/pe/version_std
+++ b/test/db/formats/pe/version_std
@@ -2,6 +2,5 @@ NAME=PE: corkami version_std.exe - open
 FILE=bins/pe/version_std.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/virtEP b/test/db/formats/pe/virtEP
index 0475c3b9144..ab5d227b2a6 100644
--- a/test/db/formats/pe/virtEP
+++ b/test/db/formats/pe/virtEP
@@ -2,6 +2,5 @@ NAME=PE: corkami virtEP.exe - open
 FILE=bins/pe/virtEP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/virtgap b/test/db/formats/pe/virtgap
index f625488d0e8..71026123c43 100644
--- a/test/db/formats/pe/virtgap
+++ b/test/db/formats/pe/virtgap
@@ -2,6 +2,5 @@ NAME=PE: corkami virtgap.exe - open
 FILE=bins/pe/virtgap.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/virtrelocXP b/test/db/formats/pe/virtrelocXP
index 4b8ac576853..825c3eeece9 100644
--- a/test/db/formats/pe/virtrelocXP
+++ b/test/db/formats/pe/virtrelocXP
@@ -1,8 +1,7 @@
 NAME=PE: corkami virtrelocXP.exe - open
 FILE=bins/pe/virtrelocXP.exe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami virtrelocXP.exe - entrypoint
diff --git a/test/db/formats/pe/virtsectblXP b/test/db/formats/pe/virtsectblXP
index c3167ffc116..efe80d5a7ba 100644
--- a/test/db/formats/pe/virtsectblXP
+++ b/test/db/formats/pe/virtsectblXP
@@ -2,8 +2,7 @@ NAME=PE: corkami virtsectblXP.exe - open
 FILE=bins/pe/virtsectblXP.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami virtsectblXP.exe - entrypoint
diff --git a/test/db/formats/pe/weirdsord b/test/db/formats/pe/weirdsord
index 36b5a6c0a3c..abc1045b18b 100644
--- a/test/db/formats/pe/weirdsord
+++ b/test/db/formats/pe/weirdsord
@@ -2,6 +2,5 @@ NAME=PE: corkami weirdsord.exe - open
 FILE=bins/pe/weirdsord.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/formats/pe/winver b/test/db/formats/pe/winver
index 6c781b48bad..5b2cd2c134b 100644
--- a/test/db/formats/pe/winver
+++ b/test/db/formats/pe/winver
@@ -2,8 +2,7 @@ NAME=PE: corkami winver.exe - open
 FILE=bins/pe/winver.exe
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=PE: corkami winver.exe - entrypoint
diff --git a/test/db/formats/vsf/rambo2-norom b/test/db/formats/vsf/rambo2-norom
index d5046d98441..caa8c75daf7 100644
--- a/test/db/formats/vsf/rambo2-norom
+++ b/test/db/formats/vsf/rambo2-norom
@@ -2,8 +2,7 @@ NAME=VSF: Rambo II- open
 FILE=bins/vsf/c64-rambo2-norom.vsf
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=VSF: Rambo II- detection
diff --git a/test/db/formats/vsf/rambo2-rom b/test/db/formats/vsf/rambo2-rom
index 9ffda7eb17f..c790e37e26d 100644
--- a/test/db/formats/vsf/rambo2-rom
+++ b/test/db/formats/vsf/rambo2-rom
@@ -2,8 +2,7 @@ NAME=VSF: Rambo II- open
 FILE=bins/vsf/c64-rambo2-rom.vsf
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=VSF: Rambo II- detection
diff --git a/test/db/formats/vsf/rhps-norom b/test/db/formats/vsf/rhps-norom
index 7d7d7cabd0e..07a450fb94b 100644
--- a/test/db/formats/vsf/rhps-norom
+++ b/test/db/formats/vsf/rhps-norom
@@ -2,8 +2,7 @@ NAME=VSF: Rocky Horror Picture Show- open
 FILE=bins/vsf/c128-rhps-norom.vsf
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=VSF: Rocky Horror Picture Show- detection
diff --git a/test/db/formats/vsf/rhps-rom b/test/db/formats/vsf/rhps-rom
index 2be9591a209..24469b1f997 100644
--- a/test/db/formats/vsf/rhps-rom
+++ b/test/db/formats/vsf/rhps-rom
@@ -2,8 +2,7 @@ NAME=VSF: Rocky Horror Picture Show- open
 FILE=bins/vsf/c128-rhps-rom.vsf
 ARGS=-A
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=VSF: Rocky Horror Picture Show- detection
diff --git a/test/db/formats/web_assembly b/test/db/formats/web_assembly
index b6bda6bb47a..553cb486e54 100644
--- a/test/db/formats/web_assembly
+++ b/test/db/formats/web_assembly
@@ -1,8 +1,7 @@
 NAME=WASM: Wasm - open
 FILE=bins/wasm/basic.wasm
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=WASM: Wasm - detection
diff --git a/test/db/formats/xbe b/test/db/formats/xbe
index f95df778126..34e265a14e8 100644
--- a/test/db/formats/xbe
+++ b/test/db/formats/xbe
@@ -1,8 +1,7 @@
 NAME=loading an xbe file
 FILE=bins/xbe/default.xbe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=entrypoint decoding
@@ -63,8 +62,7 @@ RUN
 NAME=loading crashy xbe file
 FILE=bins/xbe/crash.xbe
 CMDS=q!
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=xbe library versions
diff --git a/test/db/rzil/hexagon b/test/db/rzil/hexagon
index 8ef5efd6146..a16fc27d734 100644
--- a/test/db/rzil/hexagon
+++ b/test/db/rzil/hexagon
@@ -12,8 +12,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vpmpyh
@@ -23,8 +22,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vminh
@@ -34,8 +32,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vmaxh
@@ -45,8 +42,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vlsrw
@@ -56,8 +52,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vcmpw
@@ -67,8 +62,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vcmpb
@@ -78,8 +72,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_vavgw
@@ -89,8 +82,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_round
@@ -100,8 +92,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_reorder
@@ -111,8 +102,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_packet
@@ -122,8 +112,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_mpyi
@@ -133,8 +122,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_lsr
@@ -144,8 +132,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_jmp
@@ -155,8 +142,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_hwloops
@@ -166,8 +152,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_hl
@@ -177,8 +162,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_fibonacci
@@ -188,8 +172,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_ext
@@ -199,8 +182,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_dotnew
@@ -211,8 +193,7 @@ e io.cache=1
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_cmp
@@ -222,8 +203,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_clobber
@@ -234,8 +214,7 @@ e io.cache=1
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_call
@@ -245,8 +224,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_bitsplit
@@ -256,8 +234,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_bitcnt
@@ -267,8 +244,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test_abs
@@ -278,8 +254,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run first
@@ -289,8 +264,7 @@ CMDS=<<EOF
 aezi
 aezsu loc.pass
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 
@@ -302,8 +276,7 @@ e io.cache=1
 aezi
 aezsu 0x000210b0 # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run v73_scalar
@@ -314,8 +287,7 @@ e io.cache=1
 aezi
 aezsu 0x00020e40 End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run test-vma
@@ -326,8 +298,7 @@ e io.cache=1
 aezi
 aezsu 0x00020214 # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run load_align
@@ -338,8 +309,7 @@ e io.cache=1
 aezi
 aezsu 0x000227e0 # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run mem_noshuf
@@ -350,8 +320,7 @@ e io.cache=1
 aezi
 aezsu 0x00021a38 # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run preg_alias
@@ -362,8 +331,7 @@ e io.cache=1
 aezi
 aezsu 0x00021784 # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run dual_stores
@@ -374,8 +342,7 @@ e io.cache=1
 aezi
 aezsu 0x00020eac # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=Run read_write_overlap
@@ -386,6 +353,5 @@ e io.cache=1
 aezi
 aezsu 0x000211dc # End of main
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
diff --git a/test/db/rzil/ppc64 b/test/db/rzil/ppc64
index 80f82a33b21..8d8e6a2f652 100644
--- a/test/db/rzil/ppc64
+++ b/test/db/rzil/ppc64
@@ -551,8 +551,7 @@ aezse 5~var_write
 aezs
 aezse 2~var_write
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=ppc div and mul instructions
@@ -747,8 +746,7 @@ aezse 2 # nop, xnor
 aezs 3
 aezse 2 # isel
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 BROKEN=1
 RUN
 
diff --git a/test/db/tools/rz b/test/db/tools/rz
index e11e48fb638..33af1961f99 100644
--- a/test/db/tools/rz
+++ b/test/db/tools/rz
@@ -112,8 +112,7 @@ CMDS=<<EOF
 # Should not hang
 !rizin -i script/missing.rz -Nq =
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: Script 'script/missing.rz' not found.
 EOF
diff --git a/test/db/tools/rz_asm b/test/db/tools/rz_asm
index 09e7e9b365f..f34b40da884 100644
--- a/test/db/tools/rz_asm
+++ b/test/db/tools/rz_asm
@@ -413,8 +413,7 @@ NAME=rz-asm -k
 BROKEN=1
 FILE==
 CMDS=!rz-asm -k darwin 0x90
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-asm -a x86 -b 64 -E 0x55
diff --git a/test/db/tools/rz_bin b/test/db/tools/rz_bin
index 08d2c27053c..299889d9154 100644
--- a/test/db/tools/rz_bin
+++ b/test/db/tools/rz_bin
@@ -53,8 +53,7 @@ NAME=rz-bin -k file
 FILE=bins/elf/analysis/hello-linux-x86_64
 CMDS=!rz-bin -k ${RZ_FILE}
 ARGS=-e log.level=3
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 WARNING: Neither hash nor gnu_hash exist. Falling back to heuristics for deducing the number of dynamic symbols...
 WARNING: Neither hash nor gnu_hash exist. Falling back to heuristics for deducing the number of dynamic symbols...
@@ -346,8 +345,7 @@ CMDS=<<EOF
 !rz-bin -qOr/.data/-1 ${FILE}
 !rz-bin -qOr/.data/-1 ${FILE}
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-bin -ee -j
@@ -1217,8 +1215,7 @@ NAME=rz_bin_prefix is used in symbols
 FILE=bins/elf/analysis/hello-linux-x86_64
 CMDS=<<EOF
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-bin broken MZ file
diff --git a/test/db/tools/rz_find b/test/db/tools/rz_find
index 8c4a2fe01a4..b15723da398 100644
--- a/test/db/tools/rz_find
+++ b/test/db/tools/rz_find
@@ -31,8 +31,7 @@ RUN
 NAME=rz-find -f 0x00010000 -t 0x00020000 -X -s
 FILE==
 CMDS=!rz-find -f 0x00010000 -t 0x00020000 -r -X -s 250382 bins/elf/ioli/crackme0x00
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-find -r -X -x
@@ -144,8 +143,7 @@ RUN
 NAME=rz-find -a -b 0x3
 FILE==
 CMDS=!rz-find -X -s 250382 -b 0x3 bins/elf/ioli/crackme0x00
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-find -q
diff --git a/test/db/tools/rz_gg b/test/db/tools/rz_gg
index ca48e9c492f..9a4e98910bf 100644
--- a/test/db/tools/rz_gg
+++ b/test/db/tools/rz_gg
@@ -68,8 +68,7 @@ RUN
 NAME=rz-gg -p n80 -w 79:c3 -x
 FILE==
 CMDS=!rz-gg -p n80 -w 79:c3 -x
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-gg -q 0x45414146
@@ -84,8 +83,7 @@ RUN
 NAME=rz-gg -q 45414146
 FILE==
 CMDS=!rz-gg -q 45414146
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-gg -k linux -a x86 -b32 simple_cmp.r
@@ -100,8 +98,7 @@ RUN
 NAME=rz-gg bugg8.r
 FILE==
 CMDS=!rz-gg bins/other/rz-gg/bugg8.r > /dev/null
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 #CLANG=e900000000488d3524000000bf01000000b80400000248c7c2070000000f05b80100000248c7c7000000000f0531c0c348656c6c6f210a00
diff --git a/test/db/tools/rz_hash b/test/db/tools/rz_hash
index 04189477493..d45db0c94c3 100644
--- a/test/db/tools/rz_hash
+++ b/test/db/tools/rz_hash
@@ -502,8 +502,7 @@ RUN
 NAME=rz-hash -c with missing nibble
 FILE==
 CMDS=!rz-hash -a md2 -s "admin" -c 21232f297a57a5a743894a0e4a801fc
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, option -c is not a valid hexadecimal (len is not pair: 31).
 EOF
@@ -574,8 +573,7 @@ RUN
 NAME=rz-hash -c with missing nibble
 FILE==
 CMDS=!rz-hash -a md4 -s "admin" -c 21232f297a57a5a743894a0e4a801fc
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, option -c is not a valid hexadecimal (len is not pair: 31).
 EOF
@@ -638,8 +636,7 @@ RUN
 NAME=rz-hash -c with missing nibble
 FILE==
 CMDS=!rz-hash -a md5 -s "admin" -c 21232f297a57a5a743894a0e4a801fc
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, option -c is not a valid hexadecimal (len is not pair: 31).
 EOF
@@ -752,8 +749,7 @@ RUN
 NAME=rz-hash -c with custom block size and per-block hash
 FILE==
 CMDS=!rz-hash -a sha256 -b 1 -B -s "admin" -c 21232f297a57a5a743894a0e4a801f
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, option -B is incompatible with -c option.
 EOF
@@ -762,8 +758,7 @@ RUN
 NAME=rz-hash -c with base64 encoding
 FILE==
 CMDS=!rz-hash -qqE base64 -s "admin" -c 21232f297a57a5a743894a0e4a801f
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, option -c is incompatible with -E or -D with algorithm base64 or base91.
 EOF
@@ -772,8 +767,7 @@ RUN
 NAME=rz-hash -c with base64 decoding
 FILE==
 CMDS=!rz-hash -qqD base64 -s "admin" -c 21232f297a57a5a743894a0e4a801f
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, option -c is incompatible with -E or -D with algorithm base64 or base91.
 EOF
@@ -893,8 +887,7 @@ RUN
 NAME=rz-hash -qqE aes-ecb 128 bit
 FILE==
 CMDS=!rz-hash -qqE aes-ecb -K "11111111111111111111111111111111" -s "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") <(echo -en "\xff\x6f\xb5\xd9\x27\x6d\xe8\x38\x8e\x4b\x82\xa7\x73\xd0\xb5\x21\xff\x6f\xb5\xd9\x27\x6d\xe8\x38\x8e\x4b\x82\xa7\x73\xd0\xb5\x21\xff\x6f\xb5\xd9\x27\x6d\xe8\x38\x8e\x4b\x82\xa7\x73\xd0\xb5\x21\xff\x6f\xb5\xd9\x27\x6d\xe8\x38\x8e\x4b\x82\xa7\x73\xd0\xb5\x21")"
-EXPECT=<<EOF
-EOF
+EXPECT=
 RUN
 
 NAME=rz-hash -qqD aes-ecb 128 bit
@@ -1278,8 +1271,7 @@ RUN
 NAME=rz-hash empty second path
 FILE==
 CMDS=!rz-hash -a md5 bins/elf/analysis/hello-linux-x86_64 ""
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: rz-hash: error, cannot open a file without a name.
 EOF
diff --git a/test/db/tools/rz_test b/test/db/tools/rz_test
index 0985d79fe02..99ca07a7e74 100644
--- a/test/db/tools/rz_test
+++ b/test/db/tools/rz_test
@@ -16,8 +16,7 @@ CMDS=<<EOF
 pfs cat_sat_on_keyboard
 pfs CAT_SAT_ON_KEYBOARD
 EOF
-EXPECT=<<EOF
-EOF
+EXPECT=
 EXPECT_ERR=<<EOF
 ERROR: Format "cat_sat_on_keyboard" could not be found
 ERROR: Format "CAT_SAT_ON_KEYBOARD" could not be found