diff --git a/test/db/cmd/0000 b/test/db/cmd/0000
index 9f6bade66f..1eebe1867b 100644
--- a/test/db/cmd/0000
+++ b/test/db/cmd/0000
@@ -1,12 +1,12 @@
 NAME=test va mapping
 FILE=malloc://0x4000
-BROKEN=1
 CMDS=<<EOF
 s 0
 e io.va=true
 b 64
 wb 33
-S 0 0x1000 64 64 test
+om-*
+om 3 0x1000 64 0 r
 s 0x1000
 px 0x40
 sd -16
diff --git a/test/db/formats/ar b/test/db/formats/ar
index 8f6cbc5dc3..e4a153977c 100644
--- a/test/db/formats/ar
+++ b/test/db/formats/ar
@@ -6,20 +6,18 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=ar file symbols
+NAME=ar file symbols and content
 FILE=ar://bins/ar/libgdbr.a//xml.o
-CMDS=is~xml
+CMDS=<<EOF
+is~xml
+echo ---
+px 64
+EOF
 EXPECT=<<EOF
   1 ---------- 0x00000000 LOCAL  FILE      0     xml.c
   7 0x000009b3 0x080009b3 LOCAL  FUNC   5373     gdbr_parse_target_xml
  17 0x00000040 0x08000040 GLOBAL FUNC    152     gdbr_read_target_xml
-EOF
-RUN
-
-NAME=ar file content
-FILE=ar://bins/ar/libgdbr.a//xml.o
-CMDS=px 64
-EXPECT=<<EOF
+---
 - offset -   0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
 0x08000040  5548 89e5 4883 ec30 4889 7dd8 6448 8b04  UH..H..0H.}.dH..
 0x08000050  2528 0000 0048 8945 f831 c048 8b45 d80f  %(...H.E.1.H.E..
diff --git a/test/db/formats/cart b/test/db/formats/cart
index d53f3cc7c0..69087516d4 100644
--- a/test/db/formats/cart
+++ b/test/db/formats/cart
@@ -2,10 +2,12 @@ NAME=CaRT: iI and extractor info
 FILE=bins/cart/sample.cart
 CMDS=<<EOF
 iI~binsz
+echo ---
 i~packet
 EOF
 EXPECT=<<EOF
 binsz    0x00000039
+---
 packet  xtr.cart
 EOF
 RUN
diff --git a/test/db/formats/cgc b/test/db/formats/cgc
index 58f345b89d..7b80514450 100644
--- a/test/db/formats/cgc
+++ b/test/db/formats/cgc
@@ -2,6 +2,7 @@ NAME=CGC: Open/iI
 FILE=bins/cgc/CADET_00001
 CMDS=<<EOF
 iI
+echo ---
 iH
 EOF
 EXPECT=<<EOF
@@ -39,6 +40,7 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
 elf:
   e_ident:
     bytes: "7f 43 47 43 01 01 01 43 01 4d 65 72 69 6e 6f 00"
diff --git a/test/db/formats/demangling_bin b/test/db/formats/demangling_bin
index f3938f5ba3..9c45a536ae 100644
--- a/test/db/formats/demangling_bin
+++ b/test/db/formats/demangling_bin
@@ -1,6 +1,9 @@
 NAME=binsym demangling
-TOOL=rz-bin
-ARGS=-qsD c++ all bins/mach0/hellocxx-osx-i386
+FILE=bins/mach0/hellocxx-osx-i386
+CMDS=<<EOF
+e bin.demangle=true
+isq
+EOF
 EXPECT=<<EOF
 0x00002054 0 _NXArgc
 0x00002058 0 _NXArgv
@@ -28,10 +31,22 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=binsym without demangling
+NAME=binsym without demangling and simplified demangling in session
 FILE=bins/mach0/hellocxx-osx-i386
-ARGS=-M
-CMDS=isq
+ARGS=-M -e bin.demangle=true
+CMDS=<<EOF
+e bin.demangle=false
+isq
+echo ---
+e bin.demangle=true
+isq~std:
+e bin.demangle.flags=simplify
+echo ---
+isq~std:
+e bin.demangle=false
+echo ---
+isq~_Z
+EOF
 EXPECT=<<EOF
 0x00002054 0 _NXArgc
 0x00002058 0 _NXArgv
@@ -56,6 +71,55 @@ EXPECT=<<EOF
 0x00001e12 0 imp._ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
 0x00001e18 0 imp.__cxa_atexit
 0x00001e1e 0 imp.exit
+---
+0x00001d9a 0 unsigned long const& std::min<unsigned long>(unsigned long const&, unsigned long const&)
+0x00001c4e 0 std::__verify_grouping(char const*, unsigned long, std::string const&)
+0x00002064 0 std::__ioinit
+0x00001dee 0 imp.std::string::size() const
+0x00001df4 0 imp.std::string::operator[](unsigned long) const
+0x00001dfa 0 imp.std::ostream::operator<<(std::ostream& (*)(std::ostream&))
+0x00001e00 0 imp.std::ios_base::Init::Init()
+0x00001e06 0 imp.std::ios_base::Init::~Init()
+0x00001e12 0 imp.std::basic_ostream<char, std::char_traits<char>>& std::operator<<<std::char_traits<char>>(std::basic_ostream<char, std::char_traits<char>>&, char const*)
+---
+0x00001d9a 0 unsigned long const& std::min<unsigned long>(unsigned long const&, unsigned long const&)
+0x00001c4e 0 std::__verify_grouping(char const*, unsigned long, std::string const&)
+0x00002064 0 std::__ioinit
+0x00001dee 0 imp.std::string::size() const
+0x00001df4 0 imp.std::string::operator[](unsigned long) const
+0x00001dfa 0 imp.std::ostream::operator<<(std::ostream& (*)(std::ostream&))
+0x00001e00 0 imp.std::ios_base::Init::Init()
+0x00001e06 0 imp.std::ios_base::Init::~Init()
+0x00001e12 0 imp.std::ostream& std::operator<<<std::char_traits<char>>(std::ostream&, char const*)
+---
+0x00001d9a 0 __ZSt3minImERKT_S2_S2_
+0x00001ba0 0 __Z41__static_initialization_and_destruction_0ii
+0x00001c4e 0 __ZStL17__verify_groupingPKcmRKSs
+0x00002064 0 __ZStL8__ioinit
+0x00001dee 0 imp._ZNKSs4sizeEv
+0x00001df4 0 imp._ZNKSsixEm
+0x00001dfa 0 imp._ZNSolsEPFRSoS_E
+0x00001e00 0 imp._ZNSt8ios_base4InitC1Ev
+0x00001e06 0 imp._ZNSt8ios_base4InitD1Ev
+0x00001e12 0 imp._ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
+EOF
+RUN
+
+NAME=demangle c++ but simplified before the session.
+FILE=bins/mach0/hellocxx-osx-i386
+ARGS=-e bin.demangle.flags=simplify
+CMDS=<<EOF
+ic
+EOF
+EXPECT=<<EOF
+   address        min        max name                     super 
+----------------------------------------------------------------
+---------- 0x00001c4e 0x00001c4e std                      
+---------- 0x00001e00 0x00001e06 std::ios_base::Init      
+---------- 0x00001dfa 0x00001dfa std::ostream             
+---------- 0x00001e12 ---------- std::ostream& std        
+---------- 0x00001dee 0x00001df4 std::string              
+---------- 0x00001d9a 0x00001d9a unsigned long const& std 
 EOF
 RUN
 
@@ -112,18 +176,17 @@ sym.imp.MSVCP100.dll_public:_void___thiscall_std::basic_ostream_char__struct_std
 EOF
 RUN
 
-NAME=C++ demangle relocs
+NAME=C++ demangle relocs and exported GLIBCXX symbols
 FILE=bins/elf/libstdc++.so.6
-CMDS=e asm.bytes=true;pd 1 @ 0x00091004;
+CMDS=<<EOF
+e asm.bytes=true
+pd 1 @ 0x00091004
+echo ---
+iE~0x0008ce50
+EOF
 EXPECT=<<EOF
             0x00091004      488b159d880f.  mov   rdx, qword [reloc.vtable_for_std::bad_alloc] ; new:57 ; [0x1898a8:8]=0x180d28 obj.vtable_for_std::bad_alloc ; "(\r\U00000018"
-EOF
-RUN
-
-NAME=C++ demangle exported GLIBCXX symbols
-FILE=bins/elf/libstdc++.so.6
-CMDS=iE~0x0008ce50
-EXPECT=<<EOF
+---
 3770 0x0008ce50 0x0008ce50 GLOBAL FUNC  609     std::istream::ignore(long)
 3771 0x0008ce50 0x0008ce50 GLOBAL FUNC  609     std::istream::ignore(long)
 5087 0x0008ce50 0x0008ce50 GLOBAL FUNC  609     std::istream::ignore(long)
@@ -148,11 +211,12 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=c++ disasm call demangling
+NAME=c++ disasm call demangling and xref demangling (xref from fcn)
 FILE=bins/elf/abcde-qt32
 CMDS=<<EOF
-e asm.demangle=true
+e asm.var=false
 e asm.bytes=false
+e asm.demangle=true
 (pd_calls; pd 1 @ 0x0804921a; pd 1 @ 0x08049249; pd 1 @ 0x08049278)
 e asm.cmt.right=true
 .(pd_calls)
@@ -166,32 +230,7 @@ aa
 echo
 e asm.demangle=false
 .(pd_calls)
-EOF
-EXPECT=<<EOF
-            0x0804921a      call  sym.__x86.get_pc_thunk.si
-            0x08049249      call  method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
-            0x08049278      call  method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
-
-            0x0804921a      call sym.__x86.get_pc_thunk.si
-            0x08049249      call method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
-            0x08049278      call method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
-
-|           0x0804921a      call  sym.__x86.get_pc_thunk.si
-|           0x08049249      call  method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
-|           0x08049278      call  method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
-
-|           0x0804921a      call  sym.__x86.get_pc_thunk.si
-|           0x08049249      call  method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
-|           0x08049278      call  method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
-EOF
-RUN
-
-NAME=c++ xref demangling (xref from fcn)
-FILE=bins/elf/abcde-qt32
-CMDS=<<EOF
-e asm.var=false
-e asm.bytes=false
-aa
+echo ---
 s sym.__x86.get_pc_thunk.bx
 e asm.demangle=true
 pd 1
@@ -209,6 +248,22 @@ e asm.demangle=false
 pd 1
 EOF
 EXPECT=<<EOF
+            0x0804921a      call  sym.__x86.get_pc_thunk.si
+            0x08049249      call  method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
+            0x08049278      call  method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
+
+            0x0804921a      call sym.__x86.get_pc_thunk.si
+            0x08049249      call method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
+            0x08049278      call method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
+
+|           0x0804921a      call  sym.__x86.get_pc_thunk.si
+|           0x08049249      call  method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
+|           0x08049278      call  method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
+
+|           0x0804921a      call  sym.__x86.get_pc_thunk.si
+|           0x08049249      call  method.QFlags_Qt::WindowType_.QFlags_int_QFlags_Qt::WindowType_::Private::
+|           0x08049278      call  method.QLabel.QLabel_QString_const___QWidget___QFlags_Qt::WindowType
+---
             ; CALL XREF from sym._init @ 0x8049008
             ; CALL XREF from method.QtPrivate::RefCount.deref @ 0x8049349
             ; CALL XREF from method.QString.QString_char_const @ 0x804939d
@@ -475,66 +530,3 @@ EXPECT=<<EOF
 0x004009e0 16 Swift.String.init (_builtinStringLiteral(Builtin.RawPointer byteSize__Builtin.Word isASCII__Builtin.Int1 _) -> String
 EOF
 RUN
-
-NAME=demangle c++ but simplified in session.
-FILE=bins/mach0/hellocxx-osx-i386
-CMDS=<<EOF
-isq~std:
-e bin.demangle.flags=simplify
-echo ====================
-isq~std:
-e bin.demangle=false
-echo ====================
-isq~_Z
-EOF
-EXPECT=<<EOF
-0x00001d9a 0 unsigned long const& std::min<unsigned long>(unsigned long const&, unsigned long const&)
-0x00001c4e 0 std::__verify_grouping(char const*, unsigned long, std::string const&)
-0x00002064 0 std::__ioinit
-0x00001dee 0 imp.std::string::size() const
-0x00001df4 0 imp.std::string::operator[](unsigned long) const
-0x00001dfa 0 imp.std::ostream::operator<<(std::ostream& (*)(std::ostream&))
-0x00001e00 0 imp.std::ios_base::Init::Init()
-0x00001e06 0 imp.std::ios_base::Init::~Init()
-0x00001e12 0 imp.std::basic_ostream<char, std::char_traits<char>>& std::operator<<<std::char_traits<char>>(std::basic_ostream<char, std::char_traits<char>>&, char const*)
-====================
-0x00001d9a 0 unsigned long const& std::min<unsigned long>(unsigned long const&, unsigned long const&)
-0x00001c4e 0 std::__verify_grouping(char const*, unsigned long, std::string const&)
-0x00002064 0 std::__ioinit
-0x00001dee 0 imp.std::string::size() const
-0x00001df4 0 imp.std::string::operator[](unsigned long) const
-0x00001dfa 0 imp.std::ostream::operator<<(std::ostream& (*)(std::ostream&))
-0x00001e00 0 imp.std::ios_base::Init::Init()
-0x00001e06 0 imp.std::ios_base::Init::~Init()
-0x00001e12 0 imp.std::ostream& std::operator<<<std::char_traits<char>>(std::ostream&, char const*)
-====================
-0x00001d9a 0 __ZSt3minImERKT_S2_S2_
-0x00001ba0 0 __Z41__static_initialization_and_destruction_0ii
-0x00001c4e 0 __ZStL17__verify_groupingPKcmRKSs
-0x00002064 0 __ZStL8__ioinit
-0x00001dee 0 imp._ZNKSs4sizeEv
-0x00001df4 0 imp._ZNKSsixEm
-0x00001dfa 0 imp._ZNSolsEPFRSoS_E
-0x00001e00 0 imp._ZNSt8ios_base4InitC1Ev
-0x00001e06 0 imp._ZNSt8ios_base4InitD1Ev
-0x00001e12 0 imp._ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
-EOF
-RUN
-
-NAME=demangle c++ but simplified before the session.
-FILE=bins/mach0/hellocxx-osx-i386
-ARGS=-e bin.demangle.flags=simplify
-CMDS=<<EOF
-ic
-EOF
-EXPECT=<<EOF
-   address        min        max name                     super 
-----------------------------------------------------------------
----------- 0x00001c4e 0x00001c4e std                      
----------- 0x00001e00 0x00001e06 std::ios_base::Init      
----------- 0x00001dfa 0x00001dfa std::ostream             
----------- 0x00001e12 ---------- std::ostream& std        
----------- 0x00001dee 0x00001df4 std::string              
----------- 0x00001d9a 0x00001d9a unsigned long const& std 
-EOF
-RUN
diff --git a/test/db/formats/dex b/test/db/formats/dex
index eb505bebfa..cabe17daf4 100644
--- a/test/db/formats/dex
+++ b/test/db/formats/dex
@@ -2,12 +2,14 @@ NAME=invalid codesize DEX file
 FILE=bins/dex/Call.dex
 CMDS=<<EOF
 oml
+echo ---
 s
 EOF
 EXPECT=<<EOF
  1 fd: 3 +0x00000160 0x100000160 * 0x10000041b r-x fmap.data
  2 fd: 3 +0x00000000 0x00000000 - 0x0000041b r-- fmap.file
  3 fd: 4 +0x00000000 0x8000000000 - 0x8000000007 r-x vmap.reloc-targets
+---
 0x100000160
 EOF
 RUN
@@ -18,6 +20,22 @@ CMDS=<<EOF
 iZ
 echo ---
 iH
+echo ---
+ic
+icf 'Hello'
+icm 'Hello'
+echo ---
+icf 'Hello'
+icm 'Hello'
+echo ---
+icq
+echo ---
+icj~{[0].methods[1].flags[0]}
+icj~{[0].methods[1].flags[1]}
+echo ---
+dexs
+echo ---
+dexe
 EOF
 EXPECT=<<EOF
 1000
@@ -238,71 +256,7 @@ dex:
     relocs_code: "0e 00 0e 00 0e 00 0e 00 0e 00                   |..........      |"
     relocs_buffer: "0e 00 0e 00 0e 00 0e 00 0e 00                   |..........      |"
 
-EOF
-RUN
-
-NAME=Checking file size
-FILE=bins/dex/HelloSlack.dex
-CMDS=<<EOF
-%v $s
-iZ
-EOF
-EXPECT=<<EOF
-0x800
-2048
-EOF
-RUN
-
-NAME=DEX: entrypoint
-FILE=bins/dex/HelloSlack.dex
-CMDS=%v entry0
-EXPECT=<<EOF
-0x1000001c0
-EOF
-RUN
-
-NAME=DEX dex38.dex ie command
-FILE=bins/dex/dex38.dex
-CMDS=ie
-EXPECT=<<EOF
-      vaddr      paddr     hvaddr      haddr type    
------------------------------------------------------
-0x100000f70 0x00000f70 ---------- ---------- program
-0x1000010b8 0x000010b8 ---------- ---------- program
-0x10000121c 0x0000121c ---------- ---------- program
-EOF
-RUN
-
-NAME=DEX dex38.dex invoke-polymorphic
-FILE=bins/dex/dex38.dex
-CMDS=pi 2 @ 0x00125e; pi 3 @ 0x0012da
-EXPECT=<<EOF
-invoke-polymorphic {v1, v2, v3}, Ljava/lang/invoke/MethodHandle;->invoke([Ljava/lang/Object;)Ljava/lang/Object;, (II)Ljava/lang/Object;
-move-result-object v1
-invoke-polymorphic {v0, v1, v2}, Ljava/lang/invoke/MethodHandle;->invoke([Ljava/lang/Object;)Ljava/lang/Object;, (Ljava/lang/String;I)Ljava/lang/Object;
-move-result-object v0
-return-object v0
-EOF
-RUN
-
-NAME=DEX dex38.dex invoke-custom
-FILE=bins/dex/dex38.dex
-CMDS=pi 3 @ 0x00112c
-EXPECT=<<EOF
-invoke-custom {v0, v1}, call_site+0
-move-result-object v0
-return-object v0
-EOF
-RUN
-
-NAME=DEX Hello.dex classes (ic, icf & icm command)
-FILE=bins/dex/Hello.dex
-CMDS=<<EOF
-ic
-icf 'Hello'
-icm 'Hello'
-EOF
-EXPECT=<<EOF
+---
    address         min         max name  super  
 ------------------------------------------------
 0x00000174 0x1000001a4 0x10000021e Hello Object
@@ -314,16 +268,7 @@ EXPECT=<<EOF
 0x1000001a4     0 Hello pC    void <init>(String)
 0x1000001c0     1 Hello sp    void main(String[])
 0x1000001e8     2 Hello p     void say()
-EOF
-RUN
-
-NAME=DEX Hello.dex single class (icf & icm LHello)
-FILE=bins/dex/Hello.dex
-CMDS=<<EOF
-icf 'Hello'
-icm 'Hello'
-EOF
-EXPECT=<<EOF
+---
     address index class flags name type   
 ------------------------------------------
 0x100000336     0 Hello P     who  String
@@ -332,32 +277,167 @@ EXPECT=<<EOF
 0x1000001a4     0 Hello pC    void <init>(String)
 0x1000001c0     1 Hello sp    void main(String[])
 0x1000001e8     2 Hello p     void say()
-EOF
-RUN
-
-NAME=DEX Hello.dex classes quiet (icq command)
-FILE=bins/dex/Hello.dex
-CMDS=icq
-EXPECT=<<EOF
+---
 0x00000174 [0x1000001a4 - 0x10000021e] Hello Object
-EOF
-RUN
-
-NAME=DEX Hello.dex method flags (JSON) (icj)
-FILE=bins/dex/Hello.dex
-CMDS=<<EOF
-icj~{[0].methods[1].flags[0]}
-icj~{[0].methods[1].flags[1]}
-EOF
-EXPECT=<<EOF
+---
 static
 public
+---
+DEX file header:
+version             : Android 3.2 (API level 13 and earlier)
+checksum            : 1b1f79b5
+signature           : 3c99...7f13
+file_size           : 1000
+header_size         : 112
+link_size           : 0
+link_off            : 0 (0x000000)
+string_ids_size     : 22
+string_ids_off      : 112 (0x000070)
+type_ids_size       : 8
+type_ids_off        : 200 (0x0000c8)
+proto_ids_size      : 5
+proto_ids_off       : 232 (0x0000e8)
+field_ids_size      : 2
+field_ids_off       : 292 (0x000124)
+method_ids_size     : 8
+method_ids_off      : 308 (0x000134)
+class_defs_size     : 1
+class_defs_off      : 372 (0x000174)
+data_size           : 596
+data_off            : 404 (0x000194)
+
+Class #0 header:
+offset              : 0x174
+class_idx           : 0
+access_flags        : 1 (0x0001)
+superclass_idx      : 2
+interfaces_off      : 0 (0x000000)
+source_file_idx     : 2
+annotations_off     : 0 (0x000000)
+class_data_off      : 818 (0x000332)
+static_values_offset: 0 (0x000000)
+static_fields_size  : 0
+instance_fields_size: 1
+direct_methods_size : 2
+virtual_methods_size: 1
+
+Class #0            -
+  Class descriptor  : 'LHello;'
+  Access flags      : 0x0001 (PUBLIC)
+  Superclass        : 'Ljava/lang/Object;'
+  Interfaces        -
+  Static fields     -
+  Instance fields   -
+    #0             : (in LHello;)
+      name          : 'who'
+      type          : 'Ljava/lang/String;'
+      access        : 0x0002 (PRIVATE)
+  Direct methods    -
+    #0             : (in LHello;)
+      name          : '<init>'
+      type          : '(Ljava/lang/String;)V'
+      access        : 0x10001 (PUBLIC CONSTRUCTOR)
+      method_idx    : 0
+      code          : (available)
+    #1             : (in LHello;)
+      name          : 'main'
+      type          : '([Ljava/lang/String;)V'
+      access        : 0x0009 (PUBLIC STATIC)
+      method_idx    : 1
+      code          : (available)
+  Virtual methods   -
+    #0             : (in LHello;)
+      name          : 'say'
+      type          : '()V'
+      access        : 0x0001 (PUBLIC)
+      method_idx    : 2
+      code          : (available)
+---
+Class #0            -
+  Class descriptor  : 'LHello;'
+  Access flags      : 0x0001 (PUBLIC)
+  Superclass        : 'Ljava/lang/Object;'
+  Interfaces        -
+  Static fields     -
+  Instance fields   -
+  Direct methods    -
+    #0             : (in LHello;)
+      name          : '<init>'
+      type          : '(Ljava/lang/String;)V'
+      access        : 0x10001 (PUBLIC CONSTRUCTOR)
+      method_idx    : 0
+      code          : (available)
+    #1             : (in LHello;)
+      name          : 'main'
+      type          : '([Ljava/lang/String;)V'
+      access        : 0x0009 (PUBLIC STATIC)
+      method_idx    : 1
+      code          : (available)
+  Virtual methods   -
+    #0             : (in LHello;)
+      name          : 'say'
+      type          : '()V'
+      access        : 0x0001 (PUBLIC)
+      method_idx    : 2
+      code          : (available)
 EOF
 RUN
 
-NAME=DEX HelloWorld.dex symbols, fields and statics (isq command)
+NAME=Checking file size
+FILE=bins/dex/HelloSlack.dex
+CMDS=<<EOF
+%v $s
+iZ
+echo ---
+%v entry0
+EOF
+EXPECT=<<EOF
+0x800
+2048
+---
+0x1000001c0
+EOF
+RUN
+
+NAME=DEX dex38.dex
+FILE=bins/dex/dex38.dex
+CMDS=<<EOF
+ie
+echo ---
+pi 2 @ 0x00125e; pi 3 @ 0x0012da
+echo ---
+pi 3 @ 0x00112c
+EOF
+EXPECT=<<EOF
+      vaddr      paddr     hvaddr      haddr type    
+-----------------------------------------------------
+0x100000f70 0x00000f70 ---------- ---------- program
+0x1000010b8 0x000010b8 ---------- ---------- program
+0x10000121c 0x0000121c ---------- ---------- program
+---
+invoke-polymorphic {v1, v2, v3}, Ljava/lang/invoke/MethodHandle;->invoke([Ljava/lang/Object;)Ljava/lang/Object;, (II)Ljava/lang/Object;
+move-result-object v1
+invoke-polymorphic {v0, v1, v2}, Ljava/lang/invoke/MethodHandle;->invoke([Ljava/lang/Object;)Ljava/lang/Object;, (Ljava/lang/String;I)Ljava/lang/Object;
+move-result-object v0
+return-object v0
+---
+invoke-custom {v0, v1}, call_site+0
+move-result-object v0
+return-object v0
+EOF
+RUN
+
+NAME=DEX HelloWorld.dex
 FILE=bins/dex/HelloWorld.dex
-CMDS=isq
+CMDS=<<EOF
+isq
+echo ---
+fl
+echo ---
+iE
+echo ---
+pi 1 @ 0x240; pi 1 @ 0x246; pi 1 @ 0x25c; pi 1 @ 0x264; pi 1 @ 0x276; pi 1 @ 0x026a; pi 1 @ 0x0294; pi 1 @ 0x0298
+EOF
 EXPECT=<<EOF
 0x1000004f0 0 Hello localVar2
 0x1000004f2 0 Hello localVar
@@ -376,13 +456,7 @@ EXPECT=<<EOF
 0x8000000008 2 java.lang.StringBuilder imp.void <init>()
 0x800000000a 2 java.lang.StringBuilder imp.StringBuilder append(String)
 0x800000000c 2 java.lang.StringBuilder imp.String toString()
-EOF
-RUN
-
-NAME=DEX HelloWorld.dex flags (fl command)
-FILE=bins/dex/HelloWorld.dex
-CMDS=fl
-EXPECT=<<EOF
+---
 0x00000000 1460 section.file
 0x000001e8 1 class.Hello
 0x00000208 1 class.World
@@ -440,10 +514,24 @@ EXPECT=<<EOF
 0x8000000008 2 sym.StringBuilder.void__init
 0x800000000a 2 sym.StringBuilder.StringBuilder_append_String
 0x800000000c 2 sym.StringBuilder.String_toString
+---
+nth      paddr       vaddr bind   type  size lib   name                
+-----------------------------------------------------------------------
+  1 0x000004f0 0x1000004f0 GLOBAL FIELD    0 Hello localVar2
+  2 0x0000025c 0x10000025c GLOBAL METH    34 Hello void main(String[])
+---
+iput v0, v1, LHello;->localVar I
+sput v0, LHello;->localVar2 I
+sget-object v0, Ljava/lang/System;->out Ljava/io/PrintStream;
+invoke-virtual {v0, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
+invoke-virtual {v0, v1}, LHello;->foo(I)V
+new-instance v0, LHello;
+new-instance v1, Ljava/lang/StringBuilder;
+invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 EOF
 RUN
 
-NAME=DEX HelloWorld.dex imports (ii command)
+NAME=DEX HelloWorld.dex imports
 ARGS=-e bin.demangle.flags=all
 FILE=bins/dex/HelloWorld.dex
 CMDS=ii
@@ -461,47 +549,12 @@ nth      vaddr bind type  lib                     name
 EOF
 RUN
 
-NAME=DEX HelloWorld.dex exports (iE command)
-FILE=bins/dex/HelloWorld.dex
-CMDS=iE
-EXPECT=<<EOF
-nth      paddr       vaddr bind   type  size lib   name                
------------------------------------------------------------------------
-  1 0x000004f0 0x1000004f0 GLOBAL FIELD    0 Hello localVar2
-  2 0x0000025c 0x10000025c GLOBAL METH    34 Hello void main(String[])
-EOF
-RUN
-
-NAME=DEX HelloWorld.dex pi command
-FILE=bins/dex/HelloWorld.dex
-CMDS=pi 1 @ 0x240; pi 1 @ 0x246; pi 1 @ 0x25c; pi 1 @ 0x264; pi 1 @ 0x276; pi 1 @ 0x026a; pi 1 @ 0x0294; pi 1 @ 0x0298
-EXPECT=<<EOF
-iput v0, v1, LHello;->localVar I
-sput v0, LHello;->localVar2 I
-sget-object v0, Ljava/lang/System;->out Ljava/io/PrintStream;
-invoke-virtual {v0, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
-invoke-virtual {v0, v1}, LHello;->foo(I)V
-new-instance v0, LHello;
-new-instance v1, Ljava/lang/StringBuilder;
-invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-EOF
-RUN
-
 NAME=DEX HelloWorld.dex debug info
 BROKEN=1
 FILE=bins/dex/HelloWorld.dex
-CMDS=e io.va=0; e asm.bytes=1; pd 1 @0x00000290|grep Hello.java; pd 1 @0x000002f4|grep World.java; pd 1 @0x00000318|grep World.java;
-EXPECT=<<EOF
-            0x00000290      62000400       sget-object v0, Ljava/lang/System;->out Ljava/io/PrintStream; ; Hello.java:9 ; 0x180
-            0x000002f4      701008000100   invoke-direct {v1}, Ljava/lang/Object.<init>()V ; 0x8 ; World.java:5
-            0x00000318      62000400       sget-object v0, Ljava/lang/System;->out Ljava/io/PrintStream; ; World.java:11 ; 0x180
-EOF
-RUN
-
-NAME=DEX HelloWorld.dex debug info CL
-BROKEN=1
-FILE=bins/dex/HelloWorld.dex
 CMDS=<<EOF
+e io.va=0; e asm.bytes=1; pd 1 @0x00000290|grep Hello.java; pd 1 @0x000002f4|grep World.java; pd 1 @0x00000318|grep World.java;
+echo --
 ix
 echo --
 ix.@0x000002f4
@@ -511,6 +564,10 @@ echo --
 ix~?
 EOF
 EXPECT=<<EOF
+            0x00000290      62000400       sget-object v0, Ljava/lang/System;->out Ljava/io/PrintStream; ; Hello.java:9 ; 0x180
+            0x000002f4      701008000100   invoke-direct {v1}, Ljava/lang/Object.<init>()V ; 0x8 ; World.java:5
+            0x00000318      62000400       sget-object v0, Ljava/lang/System;->out Ljava/io/PrintStream; ; World.java:11 ; 0x180
+--
 0x00000238	Hello.java	4
 0x0000023b	Hello.java	5
 0x0000023e	Hello.java	6
@@ -538,166 +595,358 @@ EOF
 RUN
 
 NAME=DEX HelloWorld.dex dexdump
-BROKEN=1
 FILE=bins/dex/HelloWorld.dex
-CMDS=iHH
+CMDS=iH
 EXPECT=<<EOF
-DEX file header:
-magic               : 'dex\n035\0'
-checksum            : 190ab819
-signature           : 86db...7869
-file_size           : 1460
-header_size         : 112
-link_size           : 0
-link_off            : 0 (0x000000)
-string_ids_size     : 31
-string_ids_off      : 112 (0x000070)
-type_ids_size       : 11
-type_ids_off        : 236 (0x0000ec)
-proto_ids_size      : 6
-proto_ids_off       : 280 (0x000118)
-field_ids_size      : 5
-field_ids_off       : 352 (0x000160)
-method_ids_size     : 12
-method_ids_off      : 392 (0x000188)
-class_defs_size     : 2
-class_defs_off      : 488 (0x0001e8)
-data_size           : 908
-data_off            : 552 (0x000228)
-
-Class #0            -
-  Class descriptor  : 'LHello;'
-  Access flags      : 0x0001 (PUBLIC)
-  Superclass        : 'Ljava/lang/Object;'
-  Interfaces        -
-  Static fields     -
-    #0              : (in LHello;)
-      name          : 'localVar2'
-      type          : 'I'
-      access        : 0x0008 (STATIC)
-  Instance fields   -
-    #0              : (in LHello;)
-      name          : 'localVar'
-      type          : 'I'
-      access        : 0x0000 ()
-  Direct methods    -
-    #0              : (in LHello;)
-      name          : '<init>'
-      type          : '()V'
-      access        : 0x10001 (PUBLIC CONSTRUCTOR)
-      code          -
-      registers     : 2
-      ins           : 1
-      outs          : 1
-      insns size    : 10 16-bit code units
-      catches       : (none)
-      positions     :
-        0x0000 line=4
-        0x0003 line=5
-        0x0006 line=6
-        0x0009 line=7
-      locals        :
-        0x0000 - 0x000a reg=1 this LHello;
-    #1              : (in LHello;)
-      name          : 'main'
-      type          : '([Ljava/lang/String;)V'
-      access        : 0x0009 (PUBLIC STATIC)
-      code          -
-      registers     : 3
-      ins           : 1
-      outs          : 2
-      insns size    : 17 16-bit code units
-      catches       : (none)
-      positions     :
-        0x0000 line=14
-        0x0007 line=15
-        0x000c line=16
-        0x0010 line=17
-      locals        :
-  Virtual methods   -
-    #0              : (in LHello;)
-      name          : 'foo'
-      type          : '(I)V'
-      access        : 0x0001 (PUBLIC)
-      code          -
-      registers     : 5
-      ins           : 2
-      outs          : 2
-      insns size    : 42 16-bit code units
-      catches       : (none)
-      positions     :
-        0x0000 line=9
-        0x0021 line=10
-        0x0029 line=11
-      locals        :
-        0x0000 - 0x002a reg=3 this LHello;
-  source_file_idx   : 2 (Hello.java)
-
-Class #1            -
-  Class descriptor  : 'LWorld;'
-  Access flags      : 0x0001 (PUBLIC)
-  Superclass        : 'Ljava/lang/Object;'
-  Interfaces        -
-  Static fields     -
-  Instance fields   -
-    #0              : (in LWorld;)
-      name          : 'worldVar'
-      type          : 'I'
-      access        : 0x0000 ()
-    #1              : (in LWorld;)
-      name          : 'worldVar2'
-      type          : 'I'
-      access        : 0x0000 ()
-  Direct methods    -
-    #0              : (in LWorld;)
-      name          : '<init>'
-      type          : '()V'
-      access        : 0x10001 (PUBLIC CONSTRUCTOR)
-      code          -
-      registers     : 2
-      ins           : 1
-      outs          : 1
-      insns size    : 10 16-bit code units
-      catches       : (none)
-      positions     :
-        0x0000 line=5
-        0x0003 line=6
-        0x0006 line=7
-        0x0009 line=8
-      locals        :
-        0x0000 - 0x000a reg=1 this LWorld;
-  Virtual methods   -
-    #0              : (in LWorld;)
-      name          : 'foo'
-      type          : '(I)V'
-      access        : 0x0001 (PUBLIC)
-      code          -
-      registers     : 5
-      ins           : 2
-      outs          : 2
-      insns size    : 34 16-bit code units
-      catches       : (none)
-      positions     :
-        0x0000 line=11
-        0x0021 line=12
-      locals        :
-        0x0000 - 0x0022 reg=3 this LWorld;
-  source_file_idx   : 17 (World.java)
+dex:
+  identity:
+    header_offset: 0x0
+    magic: "64 65 78 0a                                     |dex.            |"
+    version: "30 33 35 00                                     |035.            |"
+    checksum: 420132889
+    checksum_offset: 0x8
+    signature: |
+      86 db fd cb 23 ec 21 fe 5f 34 fb d0 c6 18 35 1b |....#.!._4....5.|
+      46 ef 78 69                                     |F.xi            |
+    signature_offset: 0xc
+  file_info:
+    file_size: 1460
+    header_size: 112
+    endian_tag: 0x12345678
+  offsets_and_sizes:
+    link_size: 0
+    link_offset: 0x0
+    map_offset: 0x514
+    string_ids_size: 31
+    string_ids_offset: 0x70
+    type_ids_size: 11
+    type_ids_offset: 0xec
+    proto_ids_size: 6
+    proto_ids_offset: 0x118
+    field_ids_size: 5
+    field_ids_offset: 0x160
+    method_ids_size: 12
+    method_ids_offset: 0x188
+    class_defs_size: 2
+    class_defs_offset: 0x1e8
+    data_size: 908
+    data_offset: 0x228
+  strings_detail:
+    - size: 6
+      offset: 0x372
+    - size: 6
+      offset: 0x37a
+    - size: 10
+      offset: 0x382
+    - size: 1
+      offset: 0x38e
+    - size: 1
+      offset: 0x391
+    - size: 7
+      offset: 0x394
+    - size: 2
+      offset: 0x39d
+    - size: 7
+      offset: 0x3a1
+    - size: 21
+      offset: 0x3aa
+    - size: 19
+      offset: 0x3c1
+    - size: 18
+      offset: 0x3d6
+    - size: 18
+      offset: 0x3ea
+    - size: 25
+      offset: 0x3fe
+    - size: 18
+      offset: 0x419
+    - size: 1
+      offset: 0x42d
+    - size: 2
+      offset: 0x430
+    - size: 2
+      offset: 0x434
+    - size: 10
+      offset: 0x438
+    - size: 19
+      offset: 0x444
+    - size: 6
+      offset: 0x459
+    - size: 3
+      offset: 0x461
+    - size: 6
+      offset: 0x466
+    - size: 8
+      offset: 0x46e
+    - size: 9
+      offset: 0x478
+    - size: 4
+      offset: 0x483
+    - size: 3
+      offset: 0x489
+    - size: 7
+      offset: 0x48e
+    - size: 8
+      offset: 0x497
+    - size: 8
+      offset: 0x4a1
+    - size: 8
+      offset: 0x4ab
+    - size: 9
+      offset: 0x4b5
+  proto_ids_detail:
+    - shorty_idx: 4
+      return_type_idx: 6
+      type_list_size: 0
+      offset: 0x118
+    - shorty_idx: 6
+      return_type_idx: 7
+      type_list_size: 1
+      offset: 0x124
+      type_list:
+        - 6
+    - shorty_idx: 14
+      return_type_idx: 9
+      type_list_size: 0
+      offset: 0x130
+    - shorty_idx: 15
+      return_type_idx: 9
+      type_list_size: 1
+      offset: 0x13c
+      type_list:
+        - 0
+    - shorty_idx: 16
+      return_type_idx: 9
+      type_list_size: 1
+      offset: 0x148
+      type_list:
+        - 6
+    - shorty_idx: 16
+      return_type_idx: 9
+      type_list_size: 1
+      offset: 0x154
+      type_list:
+        - 10
+  field_ids_detail:
+    - class_idx: 1
+      type_idx: 0
+      name_idx: 22
+      offset: 0x160
+    - class_idx: 1
+      type_idx: 0
+      name_idx: 23
+      offset: 0x168
+    - class_idx: 2
+      type_idx: 0
+      name_idx: 29
+      offset: 0x170
+    - class_idx: 2
+      type_idx: 0
+      name_idx: 30
+      offset: 0x178
+    - class_idx: 8
+      type_idx: 3
+      name_idx: 25
+      offset: 0x180
+  method_ids_detail:
+    - class_idx: 1
+      proto_idx: 2
+      name_idx: 0
+      offset: 0x188
+      code_offset: 0x238
+      code_size: 20
+    - class_idx: 1
+      proto_idx: 3
+      name_idx: 20
+      offset: 0x190
+      code_offset: 0x290
+      code_size: 84
+    - class_idx: 1
+      proto_idx: 5
+      name_idx: 24
+      offset: 0x198
+      code_offset: 0x25c
+      code_size: 34
+    - class_idx: 2
+      proto_idx: 2
+      name_idx: 0
+      offset: 0x1a0
+      code_offset: 0x2f4
+      code_size: 20
+    - class_idx: 2
+      proto_idx: 3
+      name_idx: 20
+      offset: 0x1a8
+      code_offset: 0x318
+      code_size: 68
+    - class_idx: 3
+      proto_idx: 4
+      name_idx: 26
+      offset: 0x1b0
+      code_offset: 0x8000000000
+      code_size: 2
+    - class_idx: 4
+      proto_idx: 3
+      name_idx: 0
+      offset: 0x1b8
+      code_offset: 0x8000000002
+      code_size: 2
+    - class_idx: 4
+      proto_idx: 0
+      name_idx: 27
+      offset: 0x1c0
+      code_offset: 0x8000000004
+      code_size: 2
+    - class_idx: 5
+      proto_idx: 2
+      name_idx: 0
+      offset: 0x1c8
+      code_offset: 0x8000000006
+      code_size: 2
+    - class_idx: 7
+      proto_idx: 2
+      name_idx: 0
+      offset: 0x1d0
+      code_offset: 0x8000000008
+      code_size: 2
+    - class_idx: 7
+      proto_idx: 1
+      name_idx: 19
+      offset: 0x1d8
+      code_offset: 0x800000000a
+      code_size: 2
+    - class_idx: 7
+      proto_idx: 0
+      name_idx: 27
+      offset: 0x1e0
+      code_offset: 0x800000000c
+      code_size: 2
+  class_defs_detail:
+    - class_idx: 1
+      access_flags: 1
+      superclass_idx: 5
+      interfaces_offset: 0x0
+      source_file_idx: 2
+      annotations_offset: 0x0
+      class_data_offset: 0x4ec
+      static_values_offset: 0x0
+      offset: 0x1e8
+      static_fields:
+        - offset: 0x4f0
+          field_idx: 1
+          access_flags: 8
+      instance_fields:
+        - offset: 0x4f2
+          field_idx: 0
+          access_flags: 0
+      direct_methods:
+        - offset: 0x4f4
+          method_idx: 0
+          access_flags: 65537
+          registers_size: 2
+          ins_size: 1
+          outs_size: 1
+          tries_size: 0
+          debug_info_offset: 0x4c0
+          code_size: 20
+          code_offset: 0x238
+        - offset: 0x4fa
+          method_idx: 2
+          access_flags: 9
+          registers_size: 3
+          ins_size: 1
+          outs_size: 2
+          tries_size: 0
+          debug_info_offset: 0x4c8
+          code_size: 34
+          code_offset: 0x25c
+      virtual_methods:
+        - offset: 0x4fe
+          method_idx: 1
+          access_flags: 1
+          registers_size: 5
+          ins_size: 2
+          outs_size: 2
+          tries_size: 0
+          debug_info_offset: 0x4d1
+          code_size: 84
+          code_offset: 0x290
+    - class_idx: 2
+      access_flags: 1
+      superclass_idx: 5
+      interfaces_offset: 0x0
+      source_file_idx: 17
+      annotations_offset: 0x0
+      class_data_offset: 0x502
+      static_values_offset: 0x0
+      offset: 0x208
+      static_fields: []
+      instance_fields:
+        - offset: 0x506
+          field_idx: 2
+          access_flags: 0
+        - offset: 0x508
+          field_idx: 3
+          access_flags: 0
+      direct_methods:
+        - offset: 0x50a
+          method_idx: 3
+          access_flags: 65537
+          registers_size: 2
+          ins_size: 1
+          outs_size: 1
+          tries_size: 0
+          debug_info_offset: 0x4db
+          code_size: 20
+          code_offset: 0x2f4
+      virtual_methods:
+        - offset: 0x510
+          method_idx: 4
+          access_flags: 1
+          registers_size: 5
+          ins_size: 2
+          outs_size: 2
+          tries_size: 0
+          debug_info_offset: 0x4e3
+          code_size: 68
+          code_offset: 0x318
+  relocs_detail:
+    relocs_offset: 0x8000000000
+    relocs_size: 14
+    relocs_code: "0e 00 0e 00 0e 00 0e 00 0e 00 0e 00 0e 00       |..............  |"
+    relocs_buffer: "0e 00 0e 00 0e 00 0e 00 0e 00 0e 00 0e 00       |..............  |"
 
 EOF
 RUN
 
-NAME=DEX radare2installer.dex classes (is getProper)
+NAME=DEX radare2installer.dex
 ARGS=-e bin.demangle.flags=all
 FILE=bins/dex/org.radare.radare2installer.dex
-CMDS=ii~getProper
+CMDS=<<EOF
+ii~getProper
+echo ---
+icf 'com.stericson.RootTools.Installer'
+icm 'com.stericson.RootTools.Installer'
+EOF
 EXPECT=<<EOF
 402 ---------- WEAK FUNC  java.lang.System                                 String getProperty(String)
 403 ---------- WEAK FUNC  java.lang.System                                 String getProperty(String, String)
+---
+    address index class                             flags name            type                    
+--------------------------------------------------------------------------------------------------
+0x10000a4b2     0 com.stericson.RootTools.Installer sPf   BOGUS_FILE_NAME String
+0x10000a4b5     1 com.stericson.RootTools.Installer sPf   LOG_TAG         String
+0x10000a4b7     2 com.stericson.RootTools.Installer P     context         android.content.Context
+0x10000a4ba     3 com.stericson.RootTools.Installer P     filesPath       String
+    address index class                             flags name                                       
+-----------------------------------------------------------------------------------------------------
+0x100011410     0 com.stericson.RootTools.Installer pC    void <init>(android.content.Context)
+0x100011440     1 com.stericson.RootTools.Installer r     boolean installBinary(int, String, String)
+0x100011814     2 com.stericson.RootTools.Installer r     boolean isBinaryInstalled(String)
 EOF
 RUN
 
-NAME=DEX radare2installer.dex classes (ic command)
+NAME=DEX radare2installer.dex classes
 BROKEN=1
 FILE=bins/dex/org.radare.radare2installer.dex
 CMDS=ic
@@ -1647,39 +1896,16 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=DEX radare2installer.dex classes
-FILE=bins/dex/org.radare.radare2installer.dex
-CMDS=<<EOF
-icf 'com.stericson.RootTools.Installer'
-icm 'com.stericson.RootTools.Installer'
-EOF
-EXPECT=<<EOF
-    address index class                             flags name            type                    
---------------------------------------------------------------------------------------------------
-0x10000a4b2     0 com.stericson.RootTools.Installer sPf   BOGUS_FILE_NAME String
-0x10000a4b5     1 com.stericson.RootTools.Installer sPf   LOG_TAG         String
-0x10000a4b7     2 com.stericson.RootTools.Installer P     context         android.content.Context
-0x10000a4ba     3 com.stericson.RootTools.Installer P     filesPath       String
-    address index class                             flags name                                       
------------------------------------------------------------------------------------------------------
-0x100011410     0 com.stericson.RootTools.Installer pC    void <init>(android.content.Context)
-0x100011440     1 com.stericson.RootTools.Installer r     boolean installBinary(int, String, String)
-0x100011814     2 com.stericson.RootTools.Installer r     boolean isBinaryInstalled(String)
-EOF
-RUN
-
-NAME=DEX test.dex val
-FILE=bins/dex/test.dex
-CMDS=e asm.bytes=true; ao~val[1];
-EXPECT=<<EOF
-0x00000021
-EOF
-RUN
-
 NAME=DEX test.dex
 FILE=bins/dex/test.dex
-CMDS=e asm.bytes=true; pd 1 @ 0x000001c4;
+CMDS=<<EOF
+e asm.bytes=true; ao~val[1]
+echo ---
+e asm.bytes=true; pd 1 @ 0x000001c4
+EOF
 EXPECT=<<EOF
+0x00000021
+---
             0x000001c4      1234           const/4 v4, 0x3
 EOF
 RUN
@@ -1688,6 +1914,7 @@ NAME=FakeMultiDex.apk
 FILE=apk://bins/dex/FakeMultiDex.apk
 CMDS=<<EOF
 oml
+echo ---
 ol
 EOF
 EXPECT=<<EOF
@@ -1697,120 +1924,10 @@ EXPECT=<<EOF
  4 fd: 3 +0x00000194 0x100010194 * 0x1000103e7 r-x fmap.data
  5 fd: 3 +0x00000000 0x00010000 - 0x000103e7 r-- fmap.file
  6 fd: 6 +0x00000000 0x8000010000 - 0x8000010009 r-x vmap.reloc-targets
+---
  3 - r-x 0x00000800 classes2.dex
  4 * r-x 0x000003e8 classes.dex
  5 - r-x 0x0000000a vfile://0/reloc-targets
  6 - r-x 0x0000000a vfile://1/reloc-targets
 EOF
 RUN
-
-NAME=dexdump like output of the dex data 
-FILE=bins/dex/Hello.dex
-CMDS=dexs
-EXPECT=<<EOF
-DEX file header:
-version             : Android 3.2 (API level 13 and earlier)
-checksum            : 1b1f79b5
-signature           : 3c99...7f13
-file_size           : 1000
-header_size         : 112
-link_size           : 0
-link_off            : 0 (0x000000)
-string_ids_size     : 22
-string_ids_off      : 112 (0x000070)
-type_ids_size       : 8
-type_ids_off        : 200 (0x0000c8)
-proto_ids_size      : 5
-proto_ids_off       : 232 (0x0000e8)
-field_ids_size      : 2
-field_ids_off       : 292 (0x000124)
-method_ids_size     : 8
-method_ids_off      : 308 (0x000134)
-class_defs_size     : 1
-class_defs_off      : 372 (0x000174)
-data_size           : 596
-data_off            : 404 (0x000194)
-
-Class #0 header:
-offset              : 0x174
-class_idx           : 0
-access_flags        : 1 (0x0001)
-superclass_idx      : 2
-interfaces_off      : 0 (0x000000)
-source_file_idx     : 2
-annotations_off     : 0 (0x000000)
-class_data_off      : 818 (0x000332)
-static_values_offset: 0 (0x000000)
-static_fields_size  : 0
-instance_fields_size: 1
-direct_methods_size : 2
-virtual_methods_size: 1
-
-Class #0            -
-  Class descriptor  : 'LHello;'
-  Access flags      : 0x0001 (PUBLIC)
-  Superclass        : 'Ljava/lang/Object;'
-  Interfaces        -
-  Static fields     -
-  Instance fields   -
-    #0             : (in LHello;)
-      name          : 'who'
-      type          : 'Ljava/lang/String;'
-      access        : 0x0002 (PRIVATE)
-  Direct methods    -
-    #0             : (in LHello;)
-      name          : '<init>'
-      type          : '(Ljava/lang/String;)V'
-      access        : 0x10001 (PUBLIC CONSTRUCTOR)
-      method_idx    : 0
-      code          : (available)
-    #1             : (in LHello;)
-      name          : 'main'
-      type          : '([Ljava/lang/String;)V'
-      access        : 0x0009 (PUBLIC STATIC)
-      method_idx    : 1
-      code          : (available)
-  Virtual methods   -
-    #0             : (in LHello;)
-      name          : 'say'
-      type          : '()V'
-      access        : 0x0001 (PUBLIC)
-      method_idx    : 2
-      code          : (available)
-EOF
-RUN
-
-
-NAME=dexdump like output of the dex exportable symbols (public/protected) 
-FILE=bins/dex/Hello.dex
-CMDS=dexe
-EXPECT=<<EOF
-Class #0            -
-  Class descriptor  : 'LHello;'
-  Access flags      : 0x0001 (PUBLIC)
-  Superclass        : 'Ljava/lang/Object;'
-  Interfaces        -
-  Static fields     -
-  Instance fields   -
-  Direct methods    -
-    #0             : (in LHello;)
-      name          : '<init>'
-      type          : '(Ljava/lang/String;)V'
-      access        : 0x10001 (PUBLIC CONSTRUCTOR)
-      method_idx    : 0
-      code          : (available)
-    #1             : (in LHello;)
-      name          : 'main'
-      type          : '([Ljava/lang/String;)V'
-      access        : 0x0009 (PUBLIC STATIC)
-      method_idx    : 1
-      code          : (available)
-  Virtual methods   -
-    #0             : (in LHello;)
-      name          : 'say'
-      type          : '()V'
-      access        : 0x0001 (PUBLIC)
-      method_idx    : 2
-      code          : (available)
-EOF
-RUN
diff --git a/test/db/formats/dmp/dmp b/test/db/formats/dmp/dmp
index 5102ee2f59..ebdb0e29d6 100644
--- a/test/db/formats/dmp/dmp
+++ b/test/db/formats/dmp/dmp
@@ -1,15 +1,19 @@
 NAME=: DMP64 Check
 FILE=bins/dmp/bmp.dmp
-CMDS=i~format
+CMDS=<<EOF
+i~format
+echo ---
+iI
+echo ---
+iH
+echo ---
+oml~?
+echo ---
+px 64 @ 0x1000
+EOF
 EXPECT=<<EOF
 format   dmp64
-EOF
-RUN
-
-NAME=: DMP64 Info
-FILE=bins/dmp/bmp.dmp
-CMDS=iI
-EXPECT=<<EOF
+---
 arch     x86
 cpu      N/A
 features N/A
@@ -44,13 +48,7 @@ canary   false
 pie      false
 relrocs  false
 nx       false
-EOF
-RUN
-
-NAME=: DMP header & bmp header
-FILE=bins/dmp/bmp.dmp
-CMDS=iH
-EXPECT=<<EOF
+---
 dmp64:
   MajorVersion: 0xf
   MinorVersion: 0x47ba
@@ -76,21 +74,9 @@ dmp64:
     BitmapSize: 0x40000
     Pages: 0x544b
 
-EOF
-RUN
-
-NAME=: DMP BMP Page maps
-FILE=bins/dmp/bmp.dmp
-CMDS=oml~?
-EXPECT=<<EOF
+---
 398
-EOF
-RUN
-
-NAME=: Resolve vaddr
-FILE=bins/dmp/bmp.dmp
-CMDS=px 64 @ 0x1000
-EXPECT=<<EOF
+---
 - offset -   0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
 0x00001000  0000 0000 0000 0000 0000 f9ff 0000 0000  ................
 0x00001010  0006 0101 0000 0000 0000 0000 0000 0000  ................
@@ -349,7 +335,6 @@ FILE=dmp://bins/dmp/bmp.dmp
 CMDS=<<EOF
 env RZ_CURL=1
 e pdb.server=https://raw.githubusercontent.com/rizinorg/test-pdb-repository/main/
-iH
 dl dmp
 dpa
 e cfg.debug=1
@@ -361,31 +346,6 @@ dbt
 oml
 EOF
 EXPECT=<<EOF
-dmp64:
-  MajorVersion: 0xf
-  MinorVersion: 0x47ba
-  DirectoryTableBase: 0x6d4002
-  PfnDataBase: 0xfffff80510c22468
-  PsLoadedModuleList: 0xfffff80510af62f0
-  PsActiveProcessHead: 0xfffff80510ae6980
-  MachineImageType: 0x8664
-  NumberProcessors: 0x1
-  BugCheckCode:
-    Value: 0x0
-    Meaning: "Not a crash"
-  BugCheckParameter1: 0x0
-  BugCheckParameter2: 0x0
-  BugCheckParameter3: 0x0
-  BugCheckParameter4: 0x0
-  KdDebuggerDataBlock: 0xfffff80510ad45e0
-  SecondaryDataState: 0x45474150
-  ProductType: 0x45474150
-  SuiteMask: 0x45474150
-  Bitmap:
-    HeaderSize: 0xa038
-    BitmapSize: 0x40000
-    Pages: 0x544b
-
 mxcsr = 0x00001f80
 rflags = 0x0000000000040202
 rax = 0x0000000000000003
diff --git a/test/db/formats/firmware b/test/db/formats/firmware
index 413c5ebbc9..f8c42f95c1 100644
--- a/test/db/formats/firmware
+++ b/test/db/formats/firmware
@@ -1,34 +1,20 @@
-NAME=loading a BIOS file [64k]
-FILE=bins/firmware/bios_64k.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [64k]
-FILE=bins/firmware/bios_64k.bin
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_64k.bin
-CMDS=pi 1
-EXPECT=<<EOF
-jmp far 0xf000:0xffaa
-EOF
-RUN
-
-NAME=ljmp follow
+NAME=BIOS file [64k] analysis
 FILE=bins/firmware/bios_64k.bin
 CMDS=<<EOF
+ie
+echo ---
+pi 1
+echo ---
 s $j
 % $$
 EOF
 EXPECT=<<EOF
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x000ffff0 0x00000000 ---------- ---------- program
+---
+jmp far 0xf000:0xffaa
+---
 int32   1048490
 uint32  1048490
 hex     0xfffaa
@@ -44,209 +30,61 @@ trits   0t1222021020222
 EOF
 RUN
 
-NAME=loading a BIOS file [128k]
+NAME=BIOS file [128k] analysis
 FILE=bins/firmware/bios_128k.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [128k]
-FILE=bins/firmware/bios_128k.bin
-CMDS=ie
+CMDS=<<EOF
+ie
+echo ---
+pi 1
+EOF
 EXPECT=<<EOF
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_128k.bin
-CMDS=pi 1
-EXPECT=<<EOF
+---
 jmp far 0xf000:0xffaa
 EOF
 RUN
 
-NAME=loading a BIOS file [256k]
+NAME=BIOS file [256k] analysis
 FILE=bins/firmware/bios_256k.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [256k]
-FILE=bins/firmware/bios_256k.bin
-CMDS=ie
+CMDS=<<EOF
+ie
+echo ---
+pi 1
+EOF
 EXPECT=<<EOF
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_256k.bin
-CMDS=pi 1
-EXPECT=<<EOF
+---
 jmp far 0xf000:0xffaa
 EOF
 RUN
 
-NAME=loading a BIOS file [512k]
+NAME=BIOS file [512k] analysis
 FILE=bins/firmware/bios_512k.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [512k]
-FILE=bins/firmware/bios_512k.bin
-CMDS=ie
+CMDS=<<EOF
+ie
+echo ---
+pi 1
+EOF
 EXPECT=<<EOF
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_512k.bin
-CMDS=pi 1
-EXPECT=<<EOF
+---
 jmp far 0xf000:0xffaa
 EOF
 RUN
 
-NAME=loading a BIOS file [1M]
-FILE=bins/firmware/bios_1M.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [1M]
-FILE=bins/firmware/bios_1M.bin
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_1M.bin
-CMDS=pi 1
-EXPECT=<<EOF
-jmp far 0xf000:0xffaa
-EOF
-RUN
-
-NAME=loading a BIOS file [2M]
-FILE=bins/firmware/bios_2M.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [2M]
-FILE=bins/firmware/bios_2M.bin
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_2M.bin
-CMDS=pi 1
-EXPECT=<<EOF
-jmp far 0xf000:0xffaa
-EOF
-RUN
-
-NAME=loading a BIOS file [4M]
-FILE=bins/firmware/bios_4M.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [4M]
-FILE=bins/firmware/bios_4M.bin
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_4M.bin
-CMDS=pi 1
-EXPECT=<<EOF
-jmp far 0xf000:0xffaa
-EOF
-RUN
-
-NAME=loading a BIOS file [8M]
-FILE=bins/firmware/bios_8M.bin
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=entrypoint decoding [8M]
-FILE=bins/firmware/bios_8M.bin
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x000ffff0 0x00000000 ---------- ---------- program
-EOF
-RUN
-
-NAME=corrupted section data
-FILE=bins/firmware/bios_8M.bin
-CMDS=pi 1
-EXPECT=<<EOF
-jmp far 0xf000:0xffaa
-EOF
-RUN
-
-NAME=BIOS iH [64k]
-FILE=bins/firmware/bios_64k.bin
-CMDS=iH
-EXPECT=<<EOF
-bios:
-  entry_point:
-    opcode: 0xea
-    type: "far jump"
-  sections:
-    - name: "bootblk"
-      address: 0xf0000
-      size: 0x10000
-
-EOF
-RUN
-
-NAME=BIOS iH [128k]
-FILE=bins/firmware/bios_128k.bin
-CMDS=iH
-EXPECT=<<EOF
-bios:
-  entry_point:
-    opcode: 0xea
-    type: "far jump"
-  sections:
-    - name: "bootblk"
-      address: 0xf0000
-      size: 0x10000
-
-EOF
-RUN
-
-NAME=test x86 IO ports
+NAME=BIOS file [1M] analysis
 FILE=bins/firmware/bios_1M.bin
 CMDS=<<EOF
+ie
+echo ---
+pi 1
+echo ---
 e asm.cpu=generic
 e asm.platform=generic
 aa
@@ -254,6 +92,12 @@ fl @F:platform.ports
 CCl~reg
 EOF
 EXPECT=<<EOF
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x000ffff0 0x00000000 ---------- ---------- program
+---
+jmp far 0xf000:0xffaa
+---
 0x00000018 1 PS_2_register
 0x0000001a 1 PS_2_execute
 0x0000001f 1 DMA_1
@@ -292,6 +136,53 @@ EXPECT=<<EOF
 EOF
 RUN
 
+NAME=BIOS file [2M] analysis
+FILE=bins/firmware/bios_2M.bin
+CMDS=<<EOF
+ie
+echo ---
+pi 1
+EOF
+EXPECT=<<EOF
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x000ffff0 0x00000000 ---------- ---------- program
+---
+jmp far 0xf000:0xffaa
+EOF
+RUN
+
+NAME=BIOS file [4M] analysis
+FILE=bins/firmware/bios_4M.bin
+CMDS=<<EOF
+ie
+echo ---
+pi 1
+EOF
+EXPECT=<<EOF
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x000ffff0 0x00000000 ---------- ---------- program
+---
+jmp far 0xf000:0xffaa
+EOF
+RUN
+
+NAME=BIOS file [8M] analysis
+FILE=bins/firmware/bios_8M.bin
+CMDS=<<EOF
+ie
+echo ---
+pi 1
+EOF
+EXPECT=<<EOF
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x000ffff0 0x00000000 ---------- ---------- program
+---
+jmp far 0xf000:0xffaa
+EOF
+RUN
 
 NAME=GNS1: comprehensive validation
 FILE=bins/firmware/gns1_test.bin
diff --git a/test/db/formats/gba b/test/db/formats/gba
index c0e7b38af0..cf0bdd3f2d 100644
--- a/test/db/formats/gba
+++ b/test/db/formats/gba
@@ -1,16 +1,14 @@
 NAME=GBA: 3D - Maps
 FILE=bins/gba/3D.gba
-CMDS=oml
+CMDS=<<EOF
+oml
+echo ---
+iS
+EOF
 EXPECT=<<EOF
  1 fd: 4 +0x00000000 0x080105cc - 0x09ffffff r-x mmap.ROM
  2 fd: 3 +0x00000000 0x08000000 * 0x080105cb r-x fmap.ROM
-EOF
-RUN
-
-NAME=GBA: 3D - Sections
-FILE=bins/gba/3D.gba
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr    size      vaddr     vsize align perm name type flags 
 -------------------------------------------------------------------
 0x00000000 0x105cc 0x08000000 0x2000000   0x0 -r-x ROM       
diff --git a/test/db/formats/gbc b/test/db/formats/gbc
index 501edac970..d45cb5b3dd 100644
--- a/test/db/formats/gbc
+++ b/test/db/formats/gbc
@@ -1,6 +1,12 @@
 NAME=Gameboy: Sections
 FILE=bins/gbc/a.gb
-CMDS=ia;iH;oml
+CMDS=<<EOF
+ia
+echo ---
+iH
+echo ---
+oml
+EOF
 EXPECT=<<EOF
 [Info]
 arch     gb
@@ -95,6 +101,7 @@ iram_echo 0x1e00 0x0000e000 r-x   iram
 paddr vaddr len size section type string 
 -----------------------------------------
 
+---
 gb:
   main_address: 0x150
   nintendo_logo: |
@@ -124,6 +131,7 @@ gb:
   header_checksum: 0x24
   global_checksum: 0xa499
 
+---
  1 fd: 3 +0x00000000 0x00000000 * 0x00003fff r-x fmap.rom_bank00
  2 fd: 3 +0x00004000 0x00004000 - 0x00007fff r-x fmap.rom_bank01
  3 fd: 3 +0x00008000 0x00014000 - 0x00017fff r-x fmap.rom_bank02
diff --git a/test/db/formats/hunk b/test/db/formats/hunk
index 0a20b8bcf2..09f3245dd8 100644
--- a/test/db/formats/hunk
+++ b/test/db/formats/hunk
@@ -1,6 +1,10 @@
 NAME=hunk test
 FILE=bins/hunk/test
-CMDS=ia ; iH
+CMDS=<<EOF
+ia
+echo ---
+iH
+EOF
 EXPECT=<<EOF
 [Info]
 arch     m68k
@@ -224,6 +228,7 @@ name size address flags mirror
 paddr vaddr len size section type string 
 -----------------------------------------
 
+---
 hunks_count: 3
 hunks:
   - index: 0
diff --git a/test/db/formats/java b/test/db/formats/java
index 6fb97eeb2f..661c81ebe4 100644
--- a/test/db/formats/java
+++ b/test/db/formats/java
@@ -1,52 +1,99 @@
 NAME=Check if is Java lang
 FILE=bins/java/Hello.class
-CMDS=iI~lang
+CMDS=<<EOF
+iI~lang
+echo ---
+is
+echo ---
+ic
+icf 'Hello'
+icm 'Hello'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 lang     java
+---
+nth      paddr      vaddr bind   type  size lib                     name                             
+-----------------------------------------------------------------------------------------------------
+  0 0x0000022b 0x0000022b LOCAL  FUNC    42 Hello                   void <init>(String)
+  1 0x00000263 0x00000263 LOCAL  FUNC    57 Hello                   void say()
+  2 0x000002aa 0x000002aa LOCAL  FUNC    41 Hello                   void main(String[])
+  0 0x0000020b 0x0000020b LOCAL  OBJ      0 Hello                   Hello.who
+  1 0x0000000a 0x0000000a IMPORT METH     0 java.lang.Object        imp.void <init>()
+  2 0x0000000f 0x0000000f IMPORT FIELD    0 Hello                   imp.Hello.who
+  3 0x00000014 0x00000014 IMPORT FIELD    0 java.lang.System        imp.System.out
+  5 0x0000001c 0x0000001c IMPORT METH     0 java.lang.StringBuilder imp.void <init>()
+  7 0x00000024 0x00000024 IMPORT METH     0 java.lang.StringBuilder imp.StringBuilder append(String)
+  8 0x00000029 0x00000029 IMPORT METH     0 java.lang.StringBuilder imp.String toString()
+  9 0x0000002e 0x0000002e IMPORT METH     0 java.io.PrintStream     imp.void println(String)
+ 12 0x00000039 0x00000039 IMPORT METH     0 Hello                   imp.void <init>(String)
+ 13 0x0000003e 0x0000003e IMPORT METH     0 Hello                   imp.void say()
+---
+   address        min        max name  super  
+----------------------------------------------
+0x00000000 0x0000022b 0x000002d3 Hello Object
+   address index class flags name type   
+-----------------------------------------
+0x0000020b     0 Hello P     who  String
+   address index class flags name                
+-------------------------------------------------
+0x0000022b     0 Hello p     void <init>(String)
+0x00000263     1 Hello p     void say()
+0x000002aa     2 Hello sp    void main(String[])
+---
+nth      vaddr bind type  lib                     name     
+-----------------------------------------------------------
+  1 ---------- NONE METH  java.lang.Object        <init>
+  2 ---------- NONE FIELD Hello                   who
+  3 ---------- NONE FIELD java.lang.System        out
+  5 ---------- NONE METH  java.lang.StringBuilder <init>
+  7 ---------- NONE METH  java.lang.StringBuilder append
+  8 ---------- NONE METH  java.lang.StringBuilder toString
+  9 ---------- NONE METH  java.io.PrintStream     println
+ 12 ---------- NONE METH  Hello                   <init>
+ 13 ---------- NONE METH  Hello                   say
+---
+     paddr  size      vaddr vsize align perm name                             type flags 
+-----------------------------------------------------------------------------------------
+0x0000000a 0x1ff 0x0000000a 0x1ff   0x0 -r-- class.constant_pool                   
+0x0000020b   0xa 0x0000020b   0xa   0x0 -r-- class.fields.who.attr                 
+0x0000020b   0xa 0x0000020b   0xa   0x0 -r-- class.fields                          
+0x00000215  0xb8 0x00000215  0xb8   0x0 -r-- class.methods                         
+0x00000215  0x38 0x00000215  0x38   0x0 -r-- class.methods._init_.attr             
+0x0000022b  0x2a 0x0000022b  0x2a   0x0 -r-x class.methods._init_.attr.0.code      
+0x0000024d  0x47 0x0000024d  0x47   0x0 -r-- class.methods.say.attr                
+0x00000263  0x39 0x00000263  0x39   0x0 -r-x class.methods.say.attr.0.code         
+0x00000294  0x39 0x00000294  0x39   0x0 -r-- class.methods.main.attr               
+0x000002aa  0x29 0x000002aa  0x29   0x0 -r-x class.methods.main.attr.0.code        
+0x000002cd   0x8 0x000002cd   0x8   0x0 -r-- class.attr                            
 EOF
 RUN
 
-
 NAME=Check if is Kotlin lang
 FILE=bins/java/HiKt.class
-CMDS=iI~lang
+CMDS=<<EOF
+iI~lang
+echo ---
+iS ; s
+echo ---
+iz
+echo ---
+is
+echo ---
+ic
+icf 'HiKt'
+icm 'HiKt'
+echo ---
+ii
+echo ---
+iE
+EOF
 EXPECT=<<EOF
 lang     kotlin
-EOF
-RUN
-
-
-NAME=Check if is Groovy lang
-FILE=bins/java/test.class
-CMDS=iI~lang
-EXPECT=<<EOF
-lang     groovy
-EOF
-RUN
-
-
-NAME=Check if has line number
-FILE=bins/java/Main.class
-CMDS=iI~linenum
-EXPECT=<<EOF
-linenum  true
-EOF
-RUN
-
-
-NAME=Check that it does not have line number
-FILE=bins/java/TryWithResources.class
-CMDS=iI~linenum
-EXPECT=<<EOF
-linenum  false
-EOF
-RUN
-
-
-NAME=Check that entry point points to main
-FILE=bins/java/HiKt.class
-CMDS=iS ; s
-EXPECT=<<EOF
+---
      paddr  size      vaddr vsize align perm name                           type flags 
 ---------------------------------------------------------------------------------------
 0x0000000a 0x201 0x0000000a 0x201   0x0 -r-- class.constant_pool                 
@@ -55,32 +102,7 @@ EXPECT=<<EOF
 0x00000225  0x31 0x00000225  0x31   0x0 -r-x class.methods.main.attr.0.code      
 0x0000025d  0x54 0x0000025d  0x54   0x0 -r-- class.attr                          
 0x225
-EOF
-RUN
-
-
-NAME=Check that entry point points to <init>
-FILE=bins/java/jdwpexeccmd.class
-CMDS=iS ; s
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                             type flags 
------------------------------------------------------------------------------------------
-0x0000000a 0x315 0x0000000a 0x315   0x0 -r-- class.constant_pool                   
-0x00000323 0x124 0x00000323 0x124   0x0 -r-- class.methods                         
-0x00000323  0x2b 0x00000323  0x2b   0x0 -r-- class.methods._init_.attr             
-0x00000339  0x1d 0x00000339  0x1d   0x0 -r-x class.methods._init_.attr.0.code      
-0x0000034e  0xf9 0x0000034e  0xf9   0x0 -r-- class.methods.run.attr                
-0x00000364  0xe9 0x00000364  0xe9   0x0 -r-x class.methods.run.attr.0.code         
-0x00000447   0x8 0x00000447   0x8   0x0 -r-- class.attr                            
-0x339
-EOF
-RUN
-
-
-NAME=Check that strings are provided by Java class
-FILE=bins/java/HiKt.class
-CMDS=iz
-EXPECT=<<EOF
+---
      paddr      vaddr len size section             type  string                                                                                                                                                                                                                                                                  
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0x0000000a 0x0000000a   4    4 class.constant_pool mutf8 HiKt
@@ -107,23 +129,465 @@ EXPECT=<<EOF
 0x000001b3 0x000001b3  36   36 class.constant_pool mutf8 RuntimeInvisibleParameterAnnotations
 0x000001da 0x000001da  10   10 class.constant_pool mutf8 SourceFile
 0x000001e7 0x000001e7  25   25 class.constant_pool mutf8 RuntimeVisibleAnnotations
+---
+nth      paddr      vaddr bind   type size lib                            name                                             
+---------------------------------------------------------------------------------------------------------------------------
+  0 0x00000225 0x00000225 GLOBAL FUNC   49 HiKt                           void main(String[])
+ 15 0x000000e7 0x000000e7 IMPORT METH    0 kotlin.jvm.internal.Intrinsics imp.void checkParameterIsNotNull(Object, String)
+---
+   address        min        max name super  
+---------------------------------------------
+0x00000000 0x00000225 0x00000256 HiKt Object
+address index class flags name type 
+------------------------------------
+   address index class flags name                
+-------------------------------------------------
+0x00000225     0 HiKt  spf   void main(String[])
+---
+nth      vaddr bind type lib                            name                    
+--------------------------------------------------------------------------------
+ 15 ---------- NONE METH kotlin.jvm.internal.Intrinsics checkParameterIsNotNull
+---
+nth      paddr      vaddr bind   type size lib  name                
+--------------------------------------------------------------------
+  0 0x00000225 0x00000225 GLOBAL FUNC   49 HiKt void main(String[])
 EOF
 RUN
 
+NAME=Check if is Groovy lang
+FILE=bins/java/test.class
+CMDS=<<EOF
+iI~lang
+echo ---
+is
+echo ---
+ic
+icf 'test'
+icm 'test'
+echo ---
+ii
+echo ---
+iS
+EOF
+EXPECT=<<EOF
+lang     groovy
+---
+nth      paddr      vaddr bind   type  size lib                                                name                                                                          
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+  0 0x000008f9 0x000008f9 LOCAL  FUNC    39 test                                               void <init>()
+  1 0x0000092e 0x0000092e LOCAL  FUNC    50 test                                               void <init>(groovy.lang.Binding)
+  2 0x0000096e 0x0000096e LOCAL  FUNC    50 test                                               void main(String[])
+  3 0x000009ae 0x000009ae LOCAL  FUNC   254 test                                               Object run()
+  4 0x00000aba 0x00000aba LOCAL  FUNC    51 test                                               groovy.lang.MetaClass $getStaticMetaClass()
+  5 0x00000afb 0x00000afb LOCAL  FUNC    97 test                                               void $createCallSiteArray_1(String[])
+  6 0x00000b6a 0x00000b6a LOCAL  FUNC    33 test                                               org.codehaus.groovy.runtime.callsite.CallSiteArray $createCallSiteArray()
+  7 0x00000b99 0x00000b99 LOCAL  FUNC    52 test                                               org.codehaus.groovy.runtime.callsite.CallSite[] $getCallSiteArray()
+  0 0x000008c9 0x000008c9 LOCAL  OBJ      0 test                                               test.$staticClassInfo
+  1 0x000008d1 0x000008d1 LOCAL  OBJ      0 test                                               test.__$stMC
+  2 0x000008d9 0x000008d9 LOCAL  OBJ      0 test                                               test.$callSiteArray
+ 13 0x0000009c 0x0000009c IMPORT METH     0 groovy.lang.Script                                 imp.void <init>()
+ 17 0x000000ef 0x000000ef IMPORT METH     0 test                                               imp.org.codehaus.groovy.runtime.callsite.CallSite[] $getCallSiteArray()
+ 22 0x00000124 0x00000124 IMPORT METH     0 groovy.lang.Script                                 imp.void <init>(groovy.lang.Binding)
+ 35 0x0000022b 0x0000022b IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object call(Object, Object, Object)
+ 55 0x00000317 0x00000317 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object callConstructor(Object, Object)
+ 61 0x0000038b 0x0000038b IMPORT METH     0 org.codehaus.groovy.runtime.ScriptBytecodeAdapter  imp.java.util.Map createMap(Object[])
+ 67 0x000003a7 0x000003a7 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object call(Object, Object)
+ 71 0x00000402 0x00000402 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object callCurrent(groovy.lang.GroovyObject, Object)
+ 79 0x00000459 0x00000459 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object callGetProperty(Object)
+ 92 0x000004b5 0x000004b5 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object call(Object)
+100 0x0000052d 0x0000052d IMPORT METH     0 java.lang.Object                                   imp.Class getClass()
+104 0x00000575 0x00000575 IMPORT METH     0 org.codehaus.groovy.runtime.ScriptBytecodeAdapter  imp.groovy.lang.MetaClass initMetaClass(Object)
+106 0x0000057f 0x0000057f IMPORT FIELD    0 test                                               imp.test.$staticClassInfo
+112 0x00000606 0x00000606 IMPORT METH     0 org.codehaus.groovy.reflection.ClassInfo           imp.org.codehaus.groovy.reflection.ClassInfo getClassInfo(Class)
+115 0x0000061f 0x0000061f IMPORT METH     0 org.codehaus.groovy.reflection.ClassInfo           imp.groovy.lang.MetaClass getMetaClass()
+147 0x00000767 0x00000767 IMPORT METH     0 test                                               imp.void $createCallSiteArray_1(String[])
+152 0x000007d3 0x000007d3 IMPORT METH     0 org.codehaus.groovy.runtime.callsite.CallSiteArray imp.void <init>(Class, String[])
+154 0x000007dd 0x000007dd IMPORT FIELD    0 test                                               imp.test.$callSiteArray
+159 0x0000080e 0x0000080e IMPORT METH     0 java.lang.ref.SoftReference                        imp.Object get()
+161 0x00000818 0x00000818 IMPORT METH     0 test                                               imp.org.codehaus.groovy.runtime.callsite.CallSiteArray $createCallSiteArray()
+164 0x0000083a 0x0000083a IMPORT METH     0 java.lang.ref.SoftReference                        imp.void <init>(Object)
+168 0x0000087f 0x0000087f IMPORT FIELD    0 org.codehaus.groovy.runtime.callsite.CallSiteArray imp.org.codehaus.groovy.runtime.callsite.CallSiteArray.array
+---
+   address        min        max name super              
+---------------------------------------------------------
+0x00000000 0x000008f9 0x00000bcd test groovy.lang.Script
+   address index class flags name             type                                     
+---------------------------------------------------------------------------------------
+0x000008c9     0 test  sPh   $staticClassInfo org.codehaus.groovy.reflection.ClassInfo
+0x000008d1     1 test  spgh  __$stMC          boolean
+0x000008d9     2 test  sPh   $callSiteArray   java.lang.ref.SoftReference
+   address index class flags name                                                                      
+-------------------------------------------------------------------------------------------------------
+0x000008f9     0 test  p     void <init>()
+0x0000092e     1 test  p     void <init>(groovy.lang.Binding)
+0x0000096e     2 test  spg   void main(String[])
+0x000009ae     3 test  p     Object run()
+0x00000aba     4 test  rh    groovy.lang.MetaClass $getStaticMetaClass()
+0x00000afb     5 test  sPh   void $createCallSiteArray_1(String[])
+0x00000b6a     6 test  sPh   org.codehaus.groovy.runtime.callsite.CallSiteArray $createCallSiteArray()
+0x00000b99     7 test  sPh   org.codehaus.groovy.runtime.callsite.CallSite[] $getCallSiteArray()
+---
+nth      vaddr bind type  lib                                                name                   
+----------------------------------------------------------------------------------------------------
+ 13 ---------- NONE METH  groovy.lang.Script                                 <init>
+ 17 ---------- NONE METH  test                                               $getCallSiteArray
+ 22 ---------- NONE METH  groovy.lang.Script                                 <init>
+ 35 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      call
+ 55 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      callConstructor
+ 61 ---------- NONE METH  org.codehaus.groovy.runtime.ScriptBytecodeAdapter  createMap
+ 67 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      call
+ 71 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      callCurrent
+ 79 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      callGetProperty
+ 92 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      call
+100 ---------- NONE METH  java.lang.Object                                   getClass
+104 ---------- NONE METH  org.codehaus.groovy.runtime.ScriptBytecodeAdapter  initMetaClass
+106 ---------- NONE FIELD test                                               $staticClassInfo
+112 ---------- NONE METH  org.codehaus.groovy.reflection.ClassInfo           getClassInfo
+115 ---------- NONE METH  org.codehaus.groovy.reflection.ClassInfo           getMetaClass
+147 ---------- NONE METH  test                                               $createCallSiteArray_1
+152 ---------- NONE METH  org.codehaus.groovy.runtime.callsite.CallSiteArray <init>
+154 ---------- NONE FIELD test                                               $callSiteArray
+159 ---------- NONE METH  java.lang.ref.SoftReference                        get
+161 ---------- NONE METH  test                                               $createCallSiteArray
+164 ---------- NONE METH  java.lang.ref.SoftReference                        <init>
+168 ---------- NONE FIELD org.codehaus.groovy.runtime.callsite.CallSiteArray array
+---
+     paddr  size      vaddr vsize align perm name                                             type flags 
+---------------------------------------------------------------------------------------------------------
+0x0000000a 0x8bd 0x0000000a 0x8bd   0x0 -r-- class.constant_pool                                   
+0x000008c9   0x8 0x000008c9   0x8   0x0 -r-- class.fields._staticClassInfo.attr                    
+0x000008d1   0x8 0x000008d1   0x8   0x0 -r-- class.fields.___stMC.attr                             
+0x000008d9   0xa 0x000008d9   0xa   0x0 -r-- class.fields._callSiteArray.attr                      
+0x000008c9  0x1a 0x000008c9  0x1a   0x0 -r-- class.fields                                          
+0x000008e3 0x2e4 0x000008e3 0x2e4   0x0 -r-- class.methods                                         
+0x000008e3  0x35 0x000008e3  0x35   0x0 -r-- class.methods._init_.attr                             
+0x000008f9  0x27 0x000008f9  0x27   0x0 -r-x class.methods._init_.attr.0.code                      
+0x00000918  0x40 0x00000918  0x40   0x0 -r-- class.methods._init__1.attr                           
+0x0000092e  0x32 0x0000092e  0x32   0x0 -r-x class.methods._init__1.attr.0.code                    
+0x00000958  0x40 0x00000958  0x40   0x0 -r-- class.methods.main.attr                               
+0x0000096e  0x32 0x0000096e  0x32   0x0 -r-x class.methods.main.attr.0.code                        
+0x00000998 0x10c 0x00000998 0x10c   0x0 -r-- class.methods.run.attr                                
+0x000009ae  0xfe 0x000009ae  0xfe   0x0 -r-x class.methods.run.attr.0.code                         
+0x00000aa4  0x41 0x00000aa4  0x41   0x0 -r-- class.methods._getStaticMetaClass.attr                
+0x00000aba  0x33 0x00000aba  0x33   0x0 -r-x class.methods._getStaticMetaClass.attr.0.code         
+0x00000ae5  0x6f 0x00000ae5  0x6f   0x0 -r-- class.methods._createCallSiteArray_1.attr             
+0x00000afb  0x61 0x00000afb  0x61   0x0 -r-x class.methods._createCallSiteArray_1.attr.0.code      
+0x00000b54  0x2f 0x00000b54  0x2f   0x0 -r-- class.methods._createCallSiteArray.attr               
+0x00000b6a  0x21 0x00000b6a  0x21   0x0 -r-x class.methods._createCallSiteArray.attr.0.code        
+0x00000b83  0x44 0x00000b83  0x44   0x0 -r-- class.methods._getCallSiteArray.attr                  
+0x00000b99  0x34 0x00000b99  0x34   0x0 -r-x class.methods._getCallSiteArray.attr.0.code           
+0x00000bc7   0x8 0x00000bc7   0x8   0x0 -r-- class.attr                                            
+EOF
+RUN
 
-NAME=Java list symbols crash2.class
+NAME=Check if has line number
+FILE=bins/java/Main.class
+CMDS=<<EOF
+iI~linenum
+echo ---
+is
+echo ---
+ic
+icf 'Main'
+icm 'Main'
+echo ---
+ii
+echo ---
+iS
+EOF
+EXPECT=<<EOF
+linenum  true
+---
+nth      paddr      vaddr bind   type  size lib                     name                                             
+---------------------------------------------------------------------------------------------------------------------
+  0 0x00000389 0x00000389 LOCAL  FUNC    29 Main                    void <init>()
+  1 0x000003b4 0x000003b4 LOCAL  FUNC   206 Main                    void main(String[])
+  1 0x0000000a 0x0000000a IMPORT METH     0 java.lang.Object        imp.void <init>()
+  2 0x0000000f 0x0000000f IMPORT FIELD    0 java.lang.System        imp.System.out
+  4 0x00000017 0x00000017 IMPORT METH     0 java.io.PrintStream     imp.void println(String)
+  8 0x00000025 0x00000025 IMPORT METH     0 java.io.FileReader      imp.void <init>(String)
+  9 0x0000002a 0x0000002a IMPORT METH     0 java.io.BufferedReader  imp.void <init>(java.io.Reader)
+ 10 0x0000002f 0x0000002f IMPORT METH     0 java.io.BufferedReader  imp.String readLine()
+ 12 0x00000037 0x00000037 IMPORT METH     0 java.lang.StringBuilder imp.void <init>()
+ 14 0x0000003f 0x0000003f IMPORT METH     0 java.lang.StringBuilder imp.StringBuilder append(String)
+ 15 0x00000044 0x00000044 IMPORT METH     0 java.lang.StringBuilder imp.String toString()
+ 16 0x00000049 0x00000049 IMPORT METH     0 java.io.BufferedReader  imp.void close()
+ 18 0x00000051 0x00000051 IMPORT FIELD    0 java.lang.System        imp.System.err
+ 21 0x0000005c 0x0000005c IMPORT METH     0 java.io.PrintStream     imp.java.io.PrintStream format(String, Object[])
+ 22 0x00000061 0x00000061 IMPORT METH     0 java.lang.Exception     imp.void printStackTrace()
+---
+   address        min        max name super  
+---------------------------------------------
+0x00000000 0x00000389 0x00000482 Main Object
+address index class flags name type 
+------------------------------------
+   address index class flags name                
+-------------------------------------------------
+0x00000389     0 Main  p     void <init>()
+0x000003b4     1 Main  sp    void main(String[])
+---
+nth      vaddr bind type  lib                     name            
+------------------------------------------------------------------
+  1 ---------- NONE METH  java.lang.Object        <init>
+  2 ---------- NONE FIELD java.lang.System        out
+  4 ---------- NONE METH  java.io.PrintStream     println
+  8 ---------- NONE METH  java.io.FileReader      <init>
+  9 ---------- NONE METH  java.io.BufferedReader  <init>
+ 10 ---------- NONE METH  java.io.BufferedReader  readLine
+ 12 ---------- NONE METH  java.lang.StringBuilder <init>
+ 14 ---------- NONE METH  java.lang.StringBuilder append
+ 15 ---------- NONE METH  java.lang.StringBuilder toString
+ 16 ---------- NONE METH  java.io.BufferedReader  close
+ 18 ---------- NONE FIELD java.lang.System        err
+ 21 ---------- NONE METH  java.io.PrintStream     format
+ 22 ---------- NONE METH  java.lang.Exception     printStackTrace
+---
+     paddr  size      vaddr vsize align perm name                             type flags 
+-----------------------------------------------------------------------------------------
+0x0000000a 0x365 0x0000000a 0x365   0x0 -r-- class.constant_pool                   
+0x00000373 0x109 0x00000373 0x109   0x0 -r-- class.methods                         
+0x00000373  0x2b 0x00000373  0x2b   0x0 -r-- class.methods._init_.attr             
+0x00000389  0x1d 0x00000389  0x1d   0x0 -r-x class.methods._init_.attr.0.code      
+0x0000039e  0xde 0x0000039e  0xde   0x0 -r-- class.methods.main.attr               
+0x000003b4  0xce 0x000003b4  0xce   0x0 -r-x class.methods.main.attr.0.code        
+0x0000047c   0x8 0x0000047c   0x8   0x0 -r-- class.attr                            
+EOF
+RUN
+
+NAME=Check that it does not have line number
+FILE=bins/java/TryWithResources.class
+CMDS=<<EOF
+iI~linenum
+echo ---
+is
+echo ---
+ic
+icf 'TryWithResources'
+icm 'TryWithResources'
+echo ---
+ii
+echo ---
+iS
+EOF
+EXPECT=<<EOF
+linenum  false
+---
+nth      paddr      vaddr bind   type   size lib                        name                              
+----------------------------------------------------------------------------------------------------------
+  0 0x00000421 0x00000421 LOCAL  FUNC     21 TryWithResources           TryWithResources $(int)
+  1 0x00000444 0x00000444 LOCAL  FUNC     50 TryWithResources           void <init>(int)
+  2 0x00000484 0x00000484 LOCAL  FUNC     62 TryWithResources           void close()
+  3 0x000004d0 0x000004d0 LOCAL  FUNC     29 TryWithResources           void $(int, RuntimeException)
+  4 0x000004fb 0x000004fb LOCAL  FUNC     20 TryWithResources           void $(RuntimeException)
+  5 0x0000051d 0x0000051d LOCAL  FUNC     23 TryWithResources           void main(String[])
+  6 0x0000054c 0x0000054c LOCAL  FUNC  18879 TryWithResources           TryWithResources.main
+  7 0x00004f19 0x00004f19 LOCAL  FUNC     24 TryWithResources           void <clinit>()
+  0 0x000003f9 0x000003f9 LOCAL  OBJ       0 TryWithResources           TryWithResources.$
+  1 0x00000401 0x00000401 LOCAL  OBJ       0 TryWithResources           TryWithResources.i
+  2 0x0000000d 0x0000000d IMPORT METH      0 TryWithResources           imp.void <init>(int)
+  3 0x00000012 0x00000012 IMPORT METH      0 java.lang.RuntimeException imp.void <init>()
+  4 0x00000017 0x00000017 IMPORT FIELD     0 java.lang.System           imp.System.out
+  6 0x0000001f 0x0000001f IMPORT METH      0 java.lang.StringBuilder    imp.void <init>()
+  8 0x00000027 0x00000027 IMPORT METH      0 java.lang.StringBuilder    imp.StringBuilder append(String)
+  9 0x0000002c 0x0000002c IMPORT METH      0 java.lang.StringBuilder    imp.StringBuilder append(int)
+ 10 0x00000031 0x00000031 IMPORT METH      0 java.lang.StringBuilder    imp.String toString()
+ 11 0x00000036 0x00000036 IMPORT METH      0 java.io.PrintStream        imp.void println(String)
+ 12 0x0000003b 0x0000003b IMPORT FIELD     0 TryWithResources           imp.TryWithResources.i
+ 14 0x00000043 0x00000043 IMPORT METH      0 java.io.PrintStream        imp.void println(Object)
+ 15 0x00000048 0x00000048 IMPORT FIELD     0 TryWithResources           imp.TryWithResources.$
+ 17 0x00000050 0x00000050 IMPORT FUNC      0 TryWithResources           imp.TryWithResources.main
+ 19 0x00000058 0x00000058 IMPORT METH      0 TryWithResources           imp.void $(RuntimeException)
+ 20 0x0000005d 0x0000005d IMPORT METH      0 java.io.PrintStream        imp.void println(int)
+ 21 0x00000062 0x00000062 IMPORT METH      0 TryWithResources           imp.void $(int, RuntimeException)
+ 22 0x00000067 0x00000067 IMPORT METH      0 TryWithResources           imp.void close()
+ 24 0x0000006f 0x0000006f IMPORT METH      0 java.lang.Throwable        imp.void addSuppressed(Throwable)
+ 25 0x00000074 0x00000074 IMPORT METH      0 TryWithResources           imp.TryWithResources $(int)
+ 26 0x00000079 0x00000079 IMPORT IMETH     0 java.lang.AutoCloseable    imp.void close()
+ 27 0x0000007e 0x0000007e IMPORT METH      0 java.lang.Throwable        imp.void printStackTrace()
+---
+   address        min        max name             super            
+-------------------------------------------------------------------
+0x00000000 0x00000421 0x00004f31 TryWithResources RuntimeException
+   address index class            flags name type             
+--------------------------------------------------------------
+0x000003f9     0 TryWithResources sp    $    TryWithResources
+0x00000401     1 TryWithResources pf    i    int
+   address index class            flags name                          
+----------------------------------------------------------------------
+0x00000421     0 TryWithResources sp    TryWithResources $(int)
+0x00000444     1 TryWithResources p     void <init>(int)
+0x00000484     2 TryWithResources p     void close()
+0x000004d0     3 TryWithResources sp    void $(int, RuntimeException)
+0x000004fb     4 TryWithResources sp    void $(RuntimeException)
+0x0000051d     5 TryWithResources sp    void main(String[])
+0x0000054c     6 TryWithResources pg    TryWithResources.main
+0x00004f19     7 TryWithResources s     void <clinit>()
+---
+nth      vaddr bind   type  lib                        name            
+-----------------------------------------------------------------------
+  2 ---------- NONE   METH  TryWithResources           <init>
+  3 ---------- NONE   METH  java.lang.RuntimeException <init>
+  4 ---------- NONE   FIELD java.lang.System           out
+  6 ---------- NONE   METH  java.lang.StringBuilder    <init>
+  8 ---------- NONE   METH  java.lang.StringBuilder    append
+  9 ---------- NONE   METH  java.lang.StringBuilder    append
+ 10 ---------- NONE   METH  java.lang.StringBuilder    toString
+ 11 ---------- NONE   METH  java.io.PrintStream        println
+ 12 ---------- NONE   FIELD TryWithResources           i
+ 14 ---------- NONE   METH  java.io.PrintStream        println
+ 15 ---------- NONE   FIELD TryWithResources           $
+ 17 ---------- GLOBAL FUNC  TryWithResources           main
+ 19 ---------- NONE   METH  TryWithResources           $
+ 20 ---------- NONE   METH  java.io.PrintStream        println
+ 21 ---------- NONE   METH  TryWithResources           $
+ 22 ---------- NONE   METH  TryWithResources           close
+ 24 ---------- NONE   METH  java.lang.Throwable        addSuppressed
+ 25 ---------- NONE   METH  TryWithResources           $
+ 26 ---------- NONE   IMETH java.lang.AutoCloseable    close
+ 27 ---------- NONE   METH  java.lang.Throwable        printStackTrace
+  0 ---------- WEAK   IFACE java.lang.AutoCloseable    *
+---
+     paddr   size      vaddr  vsize align perm name                                type flags 
+----------------------------------------------------------------------------------------------
+0x0000000a  0x3eb 0x0000000a  0x3eb   0x0 -r-- class.constant_pool                      
+0x000003f5    0x4 0x000003f5    0x4   0x0 -r-- class.interfaces                         
+0x000003f9    0x8 0x000003f9    0x8   0x0 -r-- class.fields._.attr                      
+0x00000401    0xa 0x00000401    0xa   0x0 -r-- class.fields.i.attr                      
+0x000003f9   0x12 0x000003f9   0x12   0x0 -r-- class.fields                             
+0x0000040b 0x4b20 0x0000040b 0x4b20   0x0 -r-- class.methods                            
+0x0000040b   0x23 0x0000040b   0x23   0x0 -r-- class.methods._.attr                     
+0x00000421   0x15 0x00000421   0x15   0x0 -r-x class.methods._.attr.0.code              
+0x0000042e   0x40 0x0000042e   0x40   0x0 -r-- class.methods._init_.attr                
+0x00000444   0x32 0x00000444   0x32   0x0 -r-x class.methods._init_.attr.0.code         
+0x0000046e   0x4c 0x0000046e   0x4c   0x0 -r-- class.methods.close.attr                 
+0x00000484   0x3e 0x00000484   0x3e   0x0 -r-x class.methods.close.attr.0.code          
+0x000004ba   0x2b 0x000004ba   0x2b   0x0 -r-- class.methods.__1.attr                   
+0x000004d0   0x1d 0x000004d0   0x1d   0x0 -r-x class.methods.__1.attr.0.code            
+0x000004e5   0x22 0x000004e5   0x22   0x0 -r-- class.methods.__1.attr_0x4e5             
+0x000004fb   0x14 0x000004fb   0x14   0x0 -r-x class.methods.__1.attr.0.code_0x4fb      
+0x00000507   0x2f 0x00000507   0x2f   0x0 -r-- class.methods.main.attr                  
+0x0000051d   0x17 0x0000051d   0x17   0x0 -r-x class.methods.main.attr.0.code           
+0x00000536 0x49cd 0x00000536 0x49cd   0x0 -r-- class.methods.main_1.attr                
+0x0000054c 0x49bf 0x0000054c 0x49bf   0x0 -r-x class.methods.main_1.attr.0.code         
+0x00004f03   0x28 0x00004f03   0x28   0x0 -r-- class.methods._clinit_.attr              
+0x00004f19   0x18 0x00004f19   0x18   0x0 -r-x class.methods._clinit_.attr.0.code       
+EOF
+RUN
+
+NAME=Check that entry point points to <init>
+FILE=bins/java/jdwpexeccmd.class
+CMDS=<<EOF
+iS ; s
+echo ---
+is
+echo ---
+ic
+icf 'JDWPExecCmd'
+icm 'JDWPExecCmd'
+echo ---
+ii
+EOF
+EXPECT=<<EOF
+     paddr  size      vaddr vsize align perm name                             type flags 
+-----------------------------------------------------------------------------------------
+0x0000000a 0x315 0x0000000a 0x315   0x0 -r-- class.constant_pool                   
+0x00000323 0x124 0x00000323 0x124   0x0 -r-- class.methods                         
+0x00000323  0x2b 0x00000323  0x2b   0x0 -r-- class.methods._init_.attr             
+0x00000339  0x1d 0x00000339  0x1d   0x0 -r-x class.methods._init_.attr.0.code      
+0x0000034e  0xf9 0x0000034e  0xf9   0x0 -r-- class.methods.run.attr                
+0x00000364  0xe9 0x00000364  0xe9   0x0 -r-x class.methods.run.attr.0.code         
+0x00000447   0x8 0x00000447   0x8   0x0 -r-- class.attr                            
+0x339
+---
+nth      paddr      vaddr bind   type size lib                       name                                     
+--------------------------------------------------------------------------------------------------------------
+  0 0x00000339 0x00000339 LOCAL  FUNC   29 JDWPExecCmd               void <init>()
+  1 0x00000364 0x00000364 LOCAL  FUNC  233 JDWPExecCmd               String run(String)
+  1 0x0000000a 0x0000000a IMPORT METH    0 java.lang.Object          imp.void <init>()
+  3 0x00000012 0x00000012 IMPORT METH    0 java.lang.StringBuilder   imp.void <init>()
+  4 0x00000017 0x00000017 IMPORT METH    0 java.lang.StringBuilder   imp.StringBuilder append(String)
+  6 0x0000001f 0x0000001f IMPORT METH    0 java.lang.StringBuilder   imp.String toString()
+  7 0x00000024 0x00000024 IMPORT METH    0 java.lang.Runtime         imp.Runtime getRuntime()
+  8 0x00000029 0x00000029 IMPORT METH    0 java.lang.Runtime         imp.Process exec(String)
+ 11 0x00000034 0x00000034 IMPORT METH    0 java.lang.Process         imp.java.io.InputStream getInputStream()
+ 12 0x00000039 0x00000039 IMPORT METH    0 java.io.InputStreamReader imp.void <init>(java.io.InputStream)
+ 13 0x0000003e 0x0000003e IMPORT METH    0 java.io.BufferedReader    imp.void <init>(java.io.Reader)
+ 14 0x00000043 0x00000043 IMPORT METH    0 java.io.BufferedReader    imp.String readLine()
+ 15 0x00000048 0x00000048 IMPORT METH    0 java.lang.String          imp.String trim()
+---
+   address        min        max name        super  
+----------------------------------------------------
+0x00000000 0x00000339 0x0000044d JDWPExecCmd Object
+address index class flags name type 
+------------------------------------
+   address index class       flags name               
+------------------------------------------------------
+0x00000339     0 JDWPExecCmd p     void <init>()
+0x00000364     1 JDWPExecCmd sp    String run(String)
+---
+nth      vaddr bind type lib                       name           
+------------------------------------------------------------------
+  1 ---------- NONE METH java.lang.Object          <init>
+  3 ---------- NONE METH java.lang.StringBuilder   <init>
+  4 ---------- NONE METH java.lang.StringBuilder   append
+  6 ---------- NONE METH java.lang.StringBuilder   toString
+  7 ---------- NONE METH java.lang.Runtime         getRuntime
+  8 ---------- NONE METH java.lang.Runtime         exec
+ 11 ---------- NONE METH java.lang.Process         getInputStream
+ 12 ---------- NONE METH java.io.InputStreamReader <init>
+ 13 ---------- NONE METH java.io.BufferedReader    <init>
+ 14 ---------- NONE METH java.io.BufferedReader    readLine
+ 15 ---------- NONE METH java.lang.String          trim
+EOF
+RUN
+
+NAME=Java crash2.class
 FILE=bins/java/crash2.class
-CMDS=is
+CMDS=<<EOF
+is
+echo ---
+ic
+icf 'unknown_class'
+icm 'unknown_class'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 nth paddr vaddr bind type size lib name 
 ----------------------------------------
+---
+   address        min        max name          super         
+-------------------------------------------------------------
+0x00000000 0x00000000 0x00000000 unknown_class unknown_super
+address index class flags name type 
+------------------------------------
+address index class flags name 
+-------------------------------
+---
+nth vaddr bind type lib name 
+-----------------------------
+---
+     paddr size      vaddr vsize align perm name                type flags 
+---------------------------------------------------------------------------
+0x0000000a 0x12 0x0000000a  0x12   0x0 -r-- class.constant_pool      
 EOF
 RUN
 
-
-NAME=Java list symbols DemoTest.class
+NAME=Java DemoTest.class
 FILE=bins/java/DemoTest.class
-CMDS=is
+CMDS=<<EOF
+is
+echo ---
+ic
+icf 'DemoTest'
+icm 'DemoTest'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 nth      paddr      vaddr bind   type  size lib                 name                     
 -----------------------------------------------------------------------------------------
@@ -134,13 +598,54 @@ nth      paddr      vaddr bind   type  size lib                 name
   1 0x0000000a 0x0000000a IMPORT METH     0 java.lang.Object    imp.void <init>()
   3 0x00000012 0x00000012 IMPORT FIELD    0 java.lang.System    imp.System.out
   5 0x0000001a 0x0000001a IMPORT METH     0 java.io.PrintStream imp.void println(String)
+---
+   address        min        max name     super  
+-------------------------------------------------
+0x00000000 0x00000190 0x00000236 DemoTest Object
+address index class flags name type 
+------------------------------------
+   address index class    flags name                
+----------------------------------------------------
+0x00000190     0 DemoTest p     int fun()
+0x000001b9     1 DemoTest p     void <init>()
+0x000001e8     2 DemoTest p     String res()
+0x00000211     3 DemoTest sp    void main(String[])
+---
+nth      vaddr bind type  lib                 name    
+------------------------------------------------------
+  1 ---------- NONE METH  java.lang.Object    <init>
+  3 ---------- NONE FIELD java.lang.System    out
+  5 ---------- NONE METH  java.io.PrintStream println
+---
+     paddr  size      vaddr vsize align perm name                             type flags 
+-----------------------------------------------------------------------------------------
+0x0000000a 0x16c 0x0000000a 0x16c   0x0 -r-- class.constant_pool                   
+0x0000017a  0xb6 0x0000017a  0xb6   0x0 -r-- class.methods                         
+0x0000017a  0x29 0x0000017a  0x29   0x0 -r-- class.methods.fun.attr                
+0x00000190  0x1b 0x00000190  0x1b   0x0 -r-x class.methods.fun.attr.0.code         
+0x000001a3  0x2f 0x000001a3  0x2f   0x0 -r-- class.methods._init_.attr             
+0x000001b9  0x21 0x000001b9  0x21   0x0 -r-x class.methods._init_.attr.0.code      
+0x000001d2  0x29 0x000001d2  0x29   0x0 -r-- class.methods.res.attr                
+0x000001e8  0x1b 0x000001e8  0x1b   0x0 -r-x class.methods.res.attr.0.code         
+0x000001fb  0x35 0x000001fb  0x35   0x0 -r-- class.methods.main.attr               
+0x00000211  0x25 0x00000211  0x25   0x0 -r-x class.methods.main.attr.0.code        
+0x00000230   0x8 0x00000230   0x8   0x0 -r-- class.attr                            
 EOF
 RUN
 
-
-NAME=Java list symbols ExCaseTableSwitch.class
+NAME=Java ExCaseTableSwitch.class
 FILE=bins/java/ExCaseTableSwitch.class
-CMDS=is
+CMDS=<<EOF
+is
+echo ---
+ic
+icf 'CaseTableSwitch'
+icm 'CaseTableSwitch'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 nth      paddr      vaddr bind   type  size lib                     name                            
 ----------------------------------------------------------------------------------------------------
@@ -161,94 +666,149 @@ nth      paddr      vaddr bind   type  size lib                     name
  46 0x000001fd 0x000001fd IMPORT METH     0 java.lang.String        imp.void <init>()
  55 0x00000267 0x00000267 IMPORT METH     0 java.lang.Integer       imp.Integer valueOf(int)
  61 0x000002ab 0x000002ab IMPORT METH     0 TestVariableSwitchUp    imp.void TestMultipleVariable()
+---
+   address        min        max name            super  
+--------------------------------------------------------
+0x00000000 0x00000464 0x00000d74 CaseTableSwitch Object
+address index class flags name type 
+------------------------------------
+   address index class           flags name                         
+--------------------------------------------------------------------
+0x00000464     0 CaseTableSwitch p     void <init>()
+0x000004a1     1 CaseTableSwitch p     String a(int)
+0x000005df     2 CaseTableSwitch p     int a(String)
+0x00000623     3 CaseTableSwitch p     int a()
+0x0000065d     4 CaseTableSwitch p     void hopskip_line_switch()
+0x00000816     5 CaseTableSwitch p     void straight_line_switch()
+0x000009ea     6 CaseTableSwitch p     void straight_line_switch_()
+0x00000bb6     7 CaseTableSwitch sp    void main(String[])
+---
+nth      vaddr bind type  lib                     name                 
+-----------------------------------------------------------------------
+  8 ---------- NONE METH  java.lang.Object        <init>
+ 16 ---------- NONE FIELD java.lang.System        out
+ 26 ---------- NONE METH  java.lang.StringBuilder <init>
+ 29 ---------- NONE METH  java.lang.StringBuilder append
+ 33 ---------- NONE METH  java.lang.StringBuilder toString
+ 37 ---------- NONE METH  java.io.PrintStream     println
+ 46 ---------- NONE METH  java.lang.String        <init>
+ 55 ---------- NONE METH  java.lang.Integer       valueOf
+ 61 ---------- NONE METH  TestVariableSwitchUp    TestMultipleVariable
+---
+     paddr  size      vaddr vsize align perm name                                            type flags 
+--------------------------------------------------------------------------------------------------------
+0x0000000a 0x440 0x0000000a 0x440   0x0 -r-- class.constant_pool                                  
+0x0000044e 0x920 0x0000044e 0x920   0x0 -r-- class.methods                                        
+0x0000044e  0x3d 0x0000044e  0x3d   0x0 -r-- class.methods._init_.attr                            
+0x00000464  0x2f 0x00000464  0x2f   0x0 -r-x class.methods._init_.attr.0.code                     
+0x0000048b 0x13e 0x0000048b 0x13e   0x0 -r-- class.methods.a.attr                                 
+0x000004a1 0x130 0x000004a1 0x130   0x0 -r-x class.methods.a.attr.0.code                          
+0x000005c9  0x44 0x000005c9  0x44   0x0 -r-- class.methods.a_1.attr                               
+0x000005df  0x36 0x000005df  0x36   0x0 -r-x class.methods.a_1.attr.0.code                        
+0x0000060d  0x3a 0x0000060d  0x3a   0x0 -r-- class.methods.a_1.attr_0x60d                         
+0x00000623  0x2c 0x00000623  0x2c   0x0 -r-x class.methods.a_1.attr.0.code_0x623                  
+0x00000647 0x1b9 0x00000647 0x1b9   0x0 -r-- class.methods.hopskip_line_switch.attr               
+0x0000065d 0x1ab 0x0000065d 0x1ab   0x0 -r-x class.methods.hopskip_line_switch.attr.0.code        
+0x00000800 0x1d4 0x00000800 0x1d4   0x0 -r-- class.methods.straight_line_switch.attr              
+0x00000816 0x1c6 0x00000816 0x1c6   0x0 -r-x class.methods.straight_line_switch.attr.0.code       
+0x000009d4 0x1cc 0x000009d4 0x1cc   0x0 -r-- class.methods.straight_line_switch_.attr             
+0x000009ea 0x1be 0x000009ea 0x1be   0x0 -r-x class.methods.straight_line_switch_.attr.0.code      
+0x00000ba0 0x1ce 0x00000ba0 0x1ce   0x0 -r-- class.methods.main.attr                              
+0x00000bb6 0x1be 0x00000bb6 0x1be   0x0 -r-x class.methods.main.attr.0.code                       
+0x00000d6e   0x8 0x00000d6e   0x8   0x0 -r-- class.attr                                           
 EOF
 RUN
 
-
-NAME=Java list symbols fuckedup.class
+NAME=Java fuckedup.class
 FILE=bins/java/fuckedup.class
-CMDS=is
+CMDS=<<EOF
+is
+echo ---
+ic
+icf 'unknown_class'
+icm 'unknown_class'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 nth paddr vaddr bind type size lib name 
 ----------------------------------------
+---
+   address        min        max name          super         
+-------------------------------------------------------------
+0x00000000 0x00000000 0x00000000 unknown_class unknown_super
+address index class flags name type 
+------------------------------------
+address index class flags name 
+-------------------------------
+---
+nth vaddr bind type lib name 
+-----------------------------
+---
+     paddr size      vaddr vsize align perm name                type flags 
+---------------------------------------------------------------------------
+0x0000000a 0x41 0x0000000a  0x41   0x0 -r-- class.constant_pool      
 EOF
 RUN
 
-
-NAME=Java list symbols Hello.class
-FILE=bins/java/Hello.class
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type  size lib                     name                             
------------------------------------------------------------------------------------------------------
-  0 0x0000022b 0x0000022b LOCAL  FUNC    42 Hello                   void <init>(String)
-  1 0x00000263 0x00000263 LOCAL  FUNC    57 Hello                   void say()
-  2 0x000002aa 0x000002aa LOCAL  FUNC    41 Hello                   void main(String[])
-  0 0x0000020b 0x0000020b LOCAL  OBJ      0 Hello                   Hello.who
-  1 0x0000000a 0x0000000a IMPORT METH     0 java.lang.Object        imp.void <init>()
-  2 0x0000000f 0x0000000f IMPORT FIELD    0 Hello                   imp.Hello.who
-  3 0x00000014 0x00000014 IMPORT FIELD    0 java.lang.System        imp.System.out
-  5 0x0000001c 0x0000001c IMPORT METH     0 java.lang.StringBuilder imp.void <init>()
-  7 0x00000024 0x00000024 IMPORT METH     0 java.lang.StringBuilder imp.StringBuilder append(String)
-  8 0x00000029 0x00000029 IMPORT METH     0 java.lang.StringBuilder imp.String toString()
-  9 0x0000002e 0x0000002e IMPORT METH     0 java.io.PrintStream     imp.void println(String)
- 12 0x00000039 0x00000039 IMPORT METH     0 Hello                   imp.void <init>(String)
- 13 0x0000003e 0x0000003e IMPORT METH     0 Hello                   imp.void say()
-EOF
-RUN
-
-
-NAME=Java list symbols HiKt.class
-FILE=bins/java/HiKt.class
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type size lib                            name                                             
----------------------------------------------------------------------------------------------------------------------------
-  0 0x00000225 0x00000225 GLOBAL FUNC   49 HiKt                           void main(String[])
- 15 0x000000e7 0x000000e7 IMPORT METH    0 kotlin.jvm.internal.Intrinsics imp.void checkParameterIsNotNull(Object, String)
-EOF
-RUN
-
-
-NAME=Java list symbols invisible.class
+NAME=Java invisible.class
 FILE=bins/java/invisible.class
-CMDS=is
+CMDS=<<EOF
+is
+echo ---
+ic
+icf 'Test'
+icm 'Test'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 nth      paddr      vaddr bind   type  size lib                 name                     
 -----------------------------------------------------------------------------------------
   0 0x00000120 0x00000120 LOCAL  FUNC    17 Test                void main(String[])
   7 0x0000003a 0x0000003a IMPORT FIELD    0 java.lang.System    imp.System.out
   8 0x0000003f 0x0000003f IMPORT METH     0 java.io.PrintStream imp.void println(String)
+---
+   address        min        max name super  
+---------------------------------------------
+0x00000000 0x00000120 0x00000131 Test Object
+address index class flags name type 
+------------------------------------
+   address index class flags name                
+-------------------------------------------------
+0x00000120     0 Test  sp    void main(String[])
+---
+nth      vaddr bind type  lib                 name    
+------------------------------------------------------
+  7 ---------- NONE FIELD java.lang.System    out
+  8 ---------- NONE METH  java.io.PrintStream println
+---
+     paddr  size      vaddr vsize align perm name                           type flags 
+---------------------------------------------------------------------------------------
+0x0000000a 0x100 0x0000000a 0x100   0x0 -r-- class.constant_pool                 
+0x0000010e  0x21 0x0000010e  0x21   0x0 -r-- class.methods                       
+0x0000010e  0x21 0x0000010e  0x21   0x0 -r-- class.methods.main.attr             
+0x00000120  0x11 0x00000120  0x11   0x0 -r-x class.methods.main.attr.0.code      
 EOF
 RUN
 
-
-NAME=Java list symbols jdwpexeccmd.class
-FILE=bins/java/jdwpexeccmd.class
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type size lib                       name                                     
---------------------------------------------------------------------------------------------------------------
-  0 0x00000339 0x00000339 LOCAL  FUNC   29 JDWPExecCmd               void <init>()
-  1 0x00000364 0x00000364 LOCAL  FUNC  233 JDWPExecCmd               String run(String)
-  1 0x0000000a 0x0000000a IMPORT METH    0 java.lang.Object          imp.void <init>()
-  3 0x00000012 0x00000012 IMPORT METH    0 java.lang.StringBuilder   imp.void <init>()
-  4 0x00000017 0x00000017 IMPORT METH    0 java.lang.StringBuilder   imp.StringBuilder append(String)
-  6 0x0000001f 0x0000001f IMPORT METH    0 java.lang.StringBuilder   imp.String toString()
-  7 0x00000024 0x00000024 IMPORT METH    0 java.lang.Runtime         imp.Runtime getRuntime()
-  8 0x00000029 0x00000029 IMPORT METH    0 java.lang.Runtime         imp.Process exec(String)
- 11 0x00000034 0x00000034 IMPORT METH    0 java.lang.Process         imp.java.io.InputStream getInputStream()
- 12 0x00000039 0x00000039 IMPORT METH    0 java.io.InputStreamReader imp.void <init>(java.io.InputStream)
- 13 0x0000003e 0x0000003e IMPORT METH    0 java.io.BufferedReader    imp.void <init>(java.io.Reader)
- 14 0x00000043 0x00000043 IMPORT METH    0 java.io.BufferedReader    imp.String readLine()
- 15 0x00000048 0x00000048 IMPORT METH    0 java.lang.String          imp.String trim()
-EOF
-RUN
-
-
-NAME=Java list symbols MainActivity.class
+NAME=Java MainActivity.class
 FILE=bins/java/MainActivity.class
-CMDS=is
+CMDS=<<EOF
+is
+echo ---
+ic
+icf 'org.radare2.installer.MainActivity'
+icm 'org.radare2.installer.MainActivity'
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 nth      paddr      vaddr bind   type  size lib                                  name                                                                                                
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -367,308 +927,7 @@ nth      paddr      vaddr bind   type  size lib
 141 0x00000260 0x00000260 IMPORT METH     0 android.app.AlarmManager             imp.void cancel(android.app.PendingIntent)
 142 0x00000265 0x00000265 IMPORT METH     0 android.os.SystemClock               imp.long elapsedRealtime()
 143 0x0000026a 0x0000026a IMPORT METH     0 android.app.AlarmManager             imp.void setInexactRepeating(int, long, long, android.app.PendingIntent)
-EOF
-RUN
-
-
-NAME=Java list symbols Main.class
-FILE=bins/java/Main.class
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type  size lib                     name                                             
----------------------------------------------------------------------------------------------------------------------
-  0 0x00000389 0x00000389 LOCAL  FUNC    29 Main                    void <init>()
-  1 0x000003b4 0x000003b4 LOCAL  FUNC   206 Main                    void main(String[])
-  1 0x0000000a 0x0000000a IMPORT METH     0 java.lang.Object        imp.void <init>()
-  2 0x0000000f 0x0000000f IMPORT FIELD    0 java.lang.System        imp.System.out
-  4 0x00000017 0x00000017 IMPORT METH     0 java.io.PrintStream     imp.void println(String)
-  8 0x00000025 0x00000025 IMPORT METH     0 java.io.FileReader      imp.void <init>(String)
-  9 0x0000002a 0x0000002a IMPORT METH     0 java.io.BufferedReader  imp.void <init>(java.io.Reader)
- 10 0x0000002f 0x0000002f IMPORT METH     0 java.io.BufferedReader  imp.String readLine()
- 12 0x00000037 0x00000037 IMPORT METH     0 java.lang.StringBuilder imp.void <init>()
- 14 0x0000003f 0x0000003f IMPORT METH     0 java.lang.StringBuilder imp.StringBuilder append(String)
- 15 0x00000044 0x00000044 IMPORT METH     0 java.lang.StringBuilder imp.String toString()
- 16 0x00000049 0x00000049 IMPORT METH     0 java.io.BufferedReader  imp.void close()
- 18 0x00000051 0x00000051 IMPORT FIELD    0 java.lang.System        imp.System.err
- 21 0x0000005c 0x0000005c IMPORT METH     0 java.io.PrintStream     imp.java.io.PrintStream format(String, Object[])
- 22 0x00000061 0x00000061 IMPORT METH     0 java.lang.Exception     imp.void printStackTrace()
-EOF
-RUN
-
-
-NAME=Java list symbols sjybq.class
-FILE=bins/java/sjybq.class
-CMDS=is
-EXPECT=<<EOF
-nth paddr vaddr bind type size lib name 
-----------------------------------------
-EOF
-RUN
-
-
-NAME=Java list symbols test.class
-FILE=bins/java/test.class
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type  size lib                                                name                                                                          
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  0 0x000008f9 0x000008f9 LOCAL  FUNC    39 test                                               void <init>()
-  1 0x0000092e 0x0000092e LOCAL  FUNC    50 test                                               void <init>(groovy.lang.Binding)
-  2 0x0000096e 0x0000096e LOCAL  FUNC    50 test                                               void main(String[])
-  3 0x000009ae 0x000009ae LOCAL  FUNC   254 test                                               Object run()
-  4 0x00000aba 0x00000aba LOCAL  FUNC    51 test                                               groovy.lang.MetaClass $getStaticMetaClass()
-  5 0x00000afb 0x00000afb LOCAL  FUNC    97 test                                               void $createCallSiteArray_1(String[])
-  6 0x00000b6a 0x00000b6a LOCAL  FUNC    33 test                                               org.codehaus.groovy.runtime.callsite.CallSiteArray $createCallSiteArray()
-  7 0x00000b99 0x00000b99 LOCAL  FUNC    52 test                                               org.codehaus.groovy.runtime.callsite.CallSite[] $getCallSiteArray()
-  0 0x000008c9 0x000008c9 LOCAL  OBJ      0 test                                               test.$staticClassInfo
-  1 0x000008d1 0x000008d1 LOCAL  OBJ      0 test                                               test.__$stMC
-  2 0x000008d9 0x000008d9 LOCAL  OBJ      0 test                                               test.$callSiteArray
- 13 0x0000009c 0x0000009c IMPORT METH     0 groovy.lang.Script                                 imp.void <init>()
- 17 0x000000ef 0x000000ef IMPORT METH     0 test                                               imp.org.codehaus.groovy.runtime.callsite.CallSite[] $getCallSiteArray()
- 22 0x00000124 0x00000124 IMPORT METH     0 groovy.lang.Script                                 imp.void <init>(groovy.lang.Binding)
- 35 0x0000022b 0x0000022b IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object call(Object, Object, Object)
- 55 0x00000317 0x00000317 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object callConstructor(Object, Object)
- 61 0x0000038b 0x0000038b IMPORT METH     0 org.codehaus.groovy.runtime.ScriptBytecodeAdapter  imp.java.util.Map createMap(Object[])
- 67 0x000003a7 0x000003a7 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object call(Object, Object)
- 71 0x00000402 0x00000402 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object callCurrent(groovy.lang.GroovyObject, Object)
- 79 0x00000459 0x00000459 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object callGetProperty(Object)
- 92 0x000004b5 0x000004b5 IMPORT IMETH    0 org.codehaus.groovy.runtime.callsite.CallSite      imp.Object call(Object)
-100 0x0000052d 0x0000052d IMPORT METH     0 java.lang.Object                                   imp.Class getClass()
-104 0x00000575 0x00000575 IMPORT METH     0 org.codehaus.groovy.runtime.ScriptBytecodeAdapter  imp.groovy.lang.MetaClass initMetaClass(Object)
-106 0x0000057f 0x0000057f IMPORT FIELD    0 test                                               imp.test.$staticClassInfo
-112 0x00000606 0x00000606 IMPORT METH     0 org.codehaus.groovy.reflection.ClassInfo           imp.org.codehaus.groovy.reflection.ClassInfo getClassInfo(Class)
-115 0x0000061f 0x0000061f IMPORT METH     0 org.codehaus.groovy.reflection.ClassInfo           imp.groovy.lang.MetaClass getMetaClass()
-147 0x00000767 0x00000767 IMPORT METH     0 test                                               imp.void $createCallSiteArray_1(String[])
-152 0x000007d3 0x000007d3 IMPORT METH     0 org.codehaus.groovy.runtime.callsite.CallSiteArray imp.void <init>(Class, String[])
-154 0x000007dd 0x000007dd IMPORT FIELD    0 test                                               imp.test.$callSiteArray
-159 0x0000080e 0x0000080e IMPORT METH     0 java.lang.ref.SoftReference                        imp.Object get()
-161 0x00000818 0x00000818 IMPORT METH     0 test                                               imp.org.codehaus.groovy.runtime.callsite.CallSiteArray $createCallSiteArray()
-164 0x0000083a 0x0000083a IMPORT METH     0 java.lang.ref.SoftReference                        imp.void <init>(Object)
-168 0x0000087f 0x0000087f IMPORT FIELD    0 org.codehaus.groovy.runtime.callsite.CallSiteArray imp.org.codehaus.groovy.runtime.callsite.CallSiteArray.array
-EOF
-RUN
-
-
-NAME=Java list symbols TryWithResources.class
-FILE=bins/java/TryWithResources.class
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type   size lib                        name                              
-----------------------------------------------------------------------------------------------------------
-  0 0x00000421 0x00000421 LOCAL  FUNC     21 TryWithResources           TryWithResources $(int)
-  1 0x00000444 0x00000444 LOCAL  FUNC     50 TryWithResources           void <init>(int)
-  2 0x00000484 0x00000484 LOCAL  FUNC     62 TryWithResources           void close()
-  3 0x000004d0 0x000004d0 LOCAL  FUNC     29 TryWithResources           void $(int, RuntimeException)
-  4 0x000004fb 0x000004fb LOCAL  FUNC     20 TryWithResources           void $(RuntimeException)
-  5 0x0000051d 0x0000051d LOCAL  FUNC     23 TryWithResources           void main(String[])
-  6 0x0000054c 0x0000054c LOCAL  FUNC  18879 TryWithResources           TryWithResources.main
-  7 0x00004f19 0x00004f19 LOCAL  FUNC     24 TryWithResources           void <clinit>()
-  0 0x000003f9 0x000003f9 LOCAL  OBJ       0 TryWithResources           TryWithResources.$
-  1 0x00000401 0x00000401 LOCAL  OBJ       0 TryWithResources           TryWithResources.i
-  2 0x0000000d 0x0000000d IMPORT METH      0 TryWithResources           imp.void <init>(int)
-  3 0x00000012 0x00000012 IMPORT METH      0 java.lang.RuntimeException imp.void <init>()
-  4 0x00000017 0x00000017 IMPORT FIELD     0 java.lang.System           imp.System.out
-  6 0x0000001f 0x0000001f IMPORT METH      0 java.lang.StringBuilder    imp.void <init>()
-  8 0x00000027 0x00000027 IMPORT METH      0 java.lang.StringBuilder    imp.StringBuilder append(String)
-  9 0x0000002c 0x0000002c IMPORT METH      0 java.lang.StringBuilder    imp.StringBuilder append(int)
- 10 0x00000031 0x00000031 IMPORT METH      0 java.lang.StringBuilder    imp.String toString()
- 11 0x00000036 0x00000036 IMPORT METH      0 java.io.PrintStream        imp.void println(String)
- 12 0x0000003b 0x0000003b IMPORT FIELD     0 TryWithResources           imp.TryWithResources.i
- 14 0x00000043 0x00000043 IMPORT METH      0 java.io.PrintStream        imp.void println(Object)
- 15 0x00000048 0x00000048 IMPORT FIELD     0 TryWithResources           imp.TryWithResources.$
- 17 0x00000050 0x00000050 IMPORT FUNC      0 TryWithResources           imp.TryWithResources.main
- 19 0x00000058 0x00000058 IMPORT METH      0 TryWithResources           imp.void $(RuntimeException)
- 20 0x0000005d 0x0000005d IMPORT METH      0 java.io.PrintStream        imp.void println(int)
- 21 0x00000062 0x00000062 IMPORT METH      0 TryWithResources           imp.void $(int, RuntimeException)
- 22 0x00000067 0x00000067 IMPORT METH      0 TryWithResources           imp.void close()
- 24 0x0000006f 0x0000006f IMPORT METH      0 java.lang.Throwable        imp.void addSuppressed(Throwable)
- 25 0x00000074 0x00000074 IMPORT METH      0 TryWithResources           imp.TryWithResources $(int)
- 26 0x00000079 0x00000079 IMPORT IMETH     0 java.lang.AutoCloseable    imp.void close()
- 27 0x0000007e 0x0000007e IMPORT METH      0 java.lang.Throwable        imp.void printStackTrace()
-EOF
-RUN
-
-
-NAME=Java list classes crash2.class
-FILE=bins/java/crash2.class
-CMDS=<<EOF
-ic
-icf 'unknown_class'
-icm 'unknown_class'
-EOF
-EXPECT=<<EOF
-   address        min        max name          super         
--------------------------------------------------------------
-0x00000000 0x00000000 0x00000000 unknown_class unknown_super
-address index class flags name type 
-------------------------------------
-address index class flags name 
--------------------------------
-EOF
-RUN
-
-
-NAME=Java list classes DemoTest.class
-FILE=bins/java/DemoTest.class
-CMDS=<<EOF
-ic
-icf 'DemoTest'
-icm 'DemoTest'
-EOF
-EXPECT=<<EOF
-   address        min        max name     super  
--------------------------------------------------
-0x00000000 0x00000190 0x00000236 DemoTest Object
-address index class flags name type 
-------------------------------------
-   address index class    flags name                
-----------------------------------------------------
-0x00000190     0 DemoTest p     int fun()
-0x000001b9     1 DemoTest p     void <init>()
-0x000001e8     2 DemoTest p     String res()
-0x00000211     3 DemoTest sp    void main(String[])
-EOF
-RUN
-
-
-NAME=Java list classes ExCaseTableSwitch.class
-FILE=bins/java/ExCaseTableSwitch.class
-CMDS=<<EOF
-ic
-icf 'CaseTableSwitch'
-icm 'CaseTableSwitch'
-EOF
-EXPECT=<<EOF
-   address        min        max name            super  
---------------------------------------------------------
-0x00000000 0x00000464 0x00000d74 CaseTableSwitch Object
-address index class flags name type 
-------------------------------------
-   address index class           flags name                         
---------------------------------------------------------------------
-0x00000464     0 CaseTableSwitch p     void <init>()
-0x000004a1     1 CaseTableSwitch p     String a(int)
-0x000005df     2 CaseTableSwitch p     int a(String)
-0x00000623     3 CaseTableSwitch p     int a()
-0x0000065d     4 CaseTableSwitch p     void hopskip_line_switch()
-0x00000816     5 CaseTableSwitch p     void straight_line_switch()
-0x000009ea     6 CaseTableSwitch p     void straight_line_switch_()
-0x00000bb6     7 CaseTableSwitch sp    void main(String[])
-EOF
-RUN
-
-
-NAME=Java list classes fuckedup.class
-FILE=bins/java/fuckedup.class
-CMDS=<<EOF
-ic
-icf 'unknown_class'
-icm 'unknown_class'
-EOF
-EXPECT=<<EOF
-   address        min        max name          super         
--------------------------------------------------------------
-0x00000000 0x00000000 0x00000000 unknown_class unknown_super
-address index class flags name type 
-------------------------------------
-address index class flags name 
--------------------------------
-EOF
-RUN
-
-
-NAME=Java list classes Hello.class
-FILE=bins/java/Hello.class
-CMDS=<<EOF
-ic
-icf 'Hello'
-icm 'Hello'
-EOF
-EXPECT=<<EOF
-   address        min        max name  super  
-----------------------------------------------
-0x00000000 0x0000022b 0x000002d3 Hello Object
-   address index class flags name type   
------------------------------------------
-0x0000020b     0 Hello P     who  String
-   address index class flags name                
--------------------------------------------------
-0x0000022b     0 Hello p     void <init>(String)
-0x00000263     1 Hello p     void say()
-0x000002aa     2 Hello sp    void main(String[])
-EOF
-RUN
-
-
-NAME=Java list classes HiKt.class
-FILE=bins/java/HiKt.class
-CMDS=<<EOF
-ic
-icf 'HiKt'
-icm 'HiKt'
-EOF
-EXPECT=<<EOF
-   address        min        max name super  
----------------------------------------------
-0x00000000 0x00000225 0x00000256 HiKt Object
-address index class flags name type 
-------------------------------------
-   address index class flags name                
--------------------------------------------------
-0x00000225     0 HiKt  spf   void main(String[])
-EOF
-RUN
-
-
-NAME=Java list classes invisible.class
-FILE=bins/java/invisible.class
-CMDS=<<EOF
-ic
-icf 'Test'
-icm 'Test'
-EOF
-EXPECT=<<EOF
-   address        min        max name super  
----------------------------------------------
-0x00000000 0x00000120 0x00000131 Test Object
-address index class flags name type 
-------------------------------------
-   address index class flags name                
--------------------------------------------------
-0x00000120     0 Test  sp    void main(String[])
-EOF
-RUN
-
-
-NAME=Java list classes jdwpexeccmd.class
-FILE=bins/java/jdwpexeccmd.class
-CMDS=<<EOF
-ic
-icf 'JDWPExecCmd'
-icm 'JDWPExecCmd'
-EOF
-EXPECT=<<EOF
-   address        min        max name        super  
-----------------------------------------------------
-0x00000000 0x00000339 0x0000044d JDWPExecCmd Object
-address index class flags name type 
-------------------------------------
-   address index class       flags name               
-------------------------------------------------------
-0x00000339     0 JDWPExecCmd p     void <init>()
-0x00000364     1 JDWPExecCmd sp    String run(String)
-EOF
-RUN
-
-
-NAME=Java list classes MainActivity.class
-FILE=bins/java/MainActivity.class
-CMDS=<<EOF
-ic
-icf 'org.radare2.installer.MainActivity'
-icm 'org.radare2.installer.MainActivity'
-EOF
-EXPECT=<<EOF
+---
    address        min        max name                               super                
 -----------------------------------------------------------------------------------------
 0x00000000 0x00001c87 0x000029ea org.radare2.installer.MainActivity android.app.Activity
@@ -707,221 +966,7 @@ EXPECT=<<EOF
 0x0000291f    18 org.radare2.installer.MainActivity sh    Thread access$602(org.radare2.installer.MainActivity, Thread)
 0x00002968    19 org.radare2.installer.MainActivity sh    android.os.Handler access$700(org.radare2.installer.MainActivity)
 0x000029a5    20 org.radare2.installer.MainActivity sh    boolean access$800(org.radare2.installer.MainActivity, String, String)
-EOF
-RUN
-
-
-NAME=Java list classes Main.class
-FILE=bins/java/Main.class
-CMDS=<<EOF
-ic
-icf 'Main'
-icm 'Main'
-EOF
-EXPECT=<<EOF
-   address        min        max name super  
----------------------------------------------
-0x00000000 0x00000389 0x00000482 Main Object
-address index class flags name type 
-------------------------------------
-   address index class flags name                
--------------------------------------------------
-0x00000389     0 Main  p     void <init>()
-0x000003b4     1 Main  sp    void main(String[])
-EOF
-RUN
-
-
-NAME=Java list classes sjybq.class
-FILE=bins/java/sjybq.class
-CMDS=ic
-EXPECT=<<EOF
-address min max name super 
----------------------------
-EOF
-RUN
-
-
-NAME=Java list classes test.class
-FILE=bins/java/test.class
-CMDS=<<EOF
-ic
-icf 'test'
-icm 'test'
-EOF
-EXPECT=<<EOF
-   address        min        max name super              
----------------------------------------------------------
-0x00000000 0x000008f9 0x00000bcd test groovy.lang.Script
-   address index class flags name             type                                     
----------------------------------------------------------------------------------------
-0x000008c9     0 test  sPh   $staticClassInfo org.codehaus.groovy.reflection.ClassInfo
-0x000008d1     1 test  spgh  __$stMC          boolean
-0x000008d9     2 test  sPh   $callSiteArray   java.lang.ref.SoftReference
-   address index class flags name                                                                      
--------------------------------------------------------------------------------------------------------
-0x000008f9     0 test  p     void <init>()
-0x0000092e     1 test  p     void <init>(groovy.lang.Binding)
-0x0000096e     2 test  spg   void main(String[])
-0x000009ae     3 test  p     Object run()
-0x00000aba     4 test  rh    groovy.lang.MetaClass $getStaticMetaClass()
-0x00000afb     5 test  sPh   void $createCallSiteArray_1(String[])
-0x00000b6a     6 test  sPh   org.codehaus.groovy.runtime.callsite.CallSiteArray $createCallSiteArray()
-0x00000b99     7 test  sPh   org.codehaus.groovy.runtime.callsite.CallSite[] $getCallSiteArray()
-EOF
-RUN
-
-
-NAME=Java list classes TryWithResources.class
-FILE=bins/java/TryWithResources.class
-CMDS=<<EOF
-ic
-icf 'TryWithResources'
-icm 'TryWithResources'
-EOF
-EXPECT=<<EOF
-   address        min        max name             super            
--------------------------------------------------------------------
-0x00000000 0x00000421 0x00004f31 TryWithResources RuntimeException
-   address index class            flags name type             
---------------------------------------------------------------
-0x000003f9     0 TryWithResources sp    $    TryWithResources
-0x00000401     1 TryWithResources pf    i    int
-   address index class            flags name                          
-----------------------------------------------------------------------
-0x00000421     0 TryWithResources sp    TryWithResources $(int)
-0x00000444     1 TryWithResources p     void <init>(int)
-0x00000484     2 TryWithResources p     void close()
-0x000004d0     3 TryWithResources sp    void $(int, RuntimeException)
-0x000004fb     4 TryWithResources sp    void $(RuntimeException)
-0x0000051d     5 TryWithResources sp    void main(String[])
-0x0000054c     6 TryWithResources pg    TryWithResources.main
-0x00004f19     7 TryWithResources s     void <clinit>()
-EOF
-RUN
-
-
-
-
-NAME=Java list imports crash2.class
-FILE=bins/java/crash2.class
-CMDS=ii
-EXPECT=<<EOF
-nth vaddr bind type lib name 
------------------------------
-EOF
-RUN
-
-
-NAME=Java list imports DemoTest.class
-FILE=bins/java/DemoTest.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type  lib                 name    
-------------------------------------------------------
-  1 ---------- NONE METH  java.lang.Object    <init>
-  3 ---------- NONE FIELD java.lang.System    out
-  5 ---------- NONE METH  java.io.PrintStream println
-EOF
-RUN
-
-
-NAME=Java list imports ExCaseTableSwitch.class
-FILE=bins/java/ExCaseTableSwitch.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type  lib                     name                 
------------------------------------------------------------------------
-  8 ---------- NONE METH  java.lang.Object        <init>
- 16 ---------- NONE FIELD java.lang.System        out
- 26 ---------- NONE METH  java.lang.StringBuilder <init>
- 29 ---------- NONE METH  java.lang.StringBuilder append
- 33 ---------- NONE METH  java.lang.StringBuilder toString
- 37 ---------- NONE METH  java.io.PrintStream     println
- 46 ---------- NONE METH  java.lang.String        <init>
- 55 ---------- NONE METH  java.lang.Integer       valueOf
- 61 ---------- NONE METH  TestVariableSwitchUp    TestMultipleVariable
-EOF
-RUN
-
-
-NAME=Java list imports fuckedup.class
-FILE=bins/java/fuckedup.class
-CMDS=ii
-EXPECT=<<EOF
-nth vaddr bind type lib name 
------------------------------
-EOF
-RUN
-
-
-NAME=Java list imports Hello.class
-FILE=bins/java/Hello.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type  lib                     name     
------------------------------------------------------------
-  1 ---------- NONE METH  java.lang.Object        <init>
-  2 ---------- NONE FIELD Hello                   who
-  3 ---------- NONE FIELD java.lang.System        out
-  5 ---------- NONE METH  java.lang.StringBuilder <init>
-  7 ---------- NONE METH  java.lang.StringBuilder append
-  8 ---------- NONE METH  java.lang.StringBuilder toString
-  9 ---------- NONE METH  java.io.PrintStream     println
- 12 ---------- NONE METH  Hello                   <init>
- 13 ---------- NONE METH  Hello                   say
-EOF
-RUN
-
-
-NAME=Java list imports HiKt.class
-FILE=bins/java/HiKt.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type lib                            name                    
---------------------------------------------------------------------------------
- 15 ---------- NONE METH kotlin.jvm.internal.Intrinsics checkParameterIsNotNull
-EOF
-RUN
-
-
-NAME=Java list imports invisible.class
-FILE=bins/java/invisible.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type  lib                 name    
-------------------------------------------------------
-  7 ---------- NONE FIELD java.lang.System    out
-  8 ---------- NONE METH  java.io.PrintStream println
-EOF
-RUN
-
-
-NAME=Java list imports jdwpexeccmd.class
-FILE=bins/java/jdwpexeccmd.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type lib                       name           
-------------------------------------------------------------------
-  1 ---------- NONE METH java.lang.Object          <init>
-  3 ---------- NONE METH java.lang.StringBuilder   <init>
-  4 ---------- NONE METH java.lang.StringBuilder   append
-  6 ---------- NONE METH java.lang.StringBuilder   toString
-  7 ---------- NONE METH java.lang.Runtime         getRuntime
-  8 ---------- NONE METH java.lang.Runtime         exec
- 11 ---------- NONE METH java.lang.Process         getInputStream
- 12 ---------- NONE METH java.io.InputStreamReader <init>
- 13 ---------- NONE METH java.io.BufferedReader    <init>
- 14 ---------- NONE METH java.io.BufferedReader    readLine
- 15 ---------- NONE METH java.lang.String          trim
-EOF
-RUN
-
-
-NAME=Java list imports MainActivity.class
-FILE=bins/java/MainActivity.class
-CMDS=ii
-EXPECT=<<EOF
+---
 nth      vaddr bind type  lib                                  name                        
 -------------------------------------------------------------------------------------------
   1 ---------- NONE METH  org.radare2.installer.MainActivity   download
@@ -1008,249 +1053,7 @@ nth      vaddr bind type  lib                                  name
 141 ---------- NONE METH  android.app.AlarmManager             cancel
 142 ---------- NONE METH  android.os.SystemClock               elapsedRealtime
 143 ---------- NONE METH  android.app.AlarmManager             setInexactRepeating
-EOF
-RUN
-
-
-NAME=Java list imports Main.class
-FILE=bins/java/Main.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type  lib                     name            
-------------------------------------------------------------------
-  1 ---------- NONE METH  java.lang.Object        <init>
-  2 ---------- NONE FIELD java.lang.System        out
-  4 ---------- NONE METH  java.io.PrintStream     println
-  8 ---------- NONE METH  java.io.FileReader      <init>
-  9 ---------- NONE METH  java.io.BufferedReader  <init>
- 10 ---------- NONE METH  java.io.BufferedReader  readLine
- 12 ---------- NONE METH  java.lang.StringBuilder <init>
- 14 ---------- NONE METH  java.lang.StringBuilder append
- 15 ---------- NONE METH  java.lang.StringBuilder toString
- 16 ---------- NONE METH  java.io.BufferedReader  close
- 18 ---------- NONE FIELD java.lang.System        err
- 21 ---------- NONE METH  java.io.PrintStream     format
- 22 ---------- NONE METH  java.lang.Exception     printStackTrace
-EOF
-RUN
-
-
-NAME=Java list imports sjybq.class
-FILE=bins/java/sjybq.class
-CMDS=ii
-EXPECT=<<EOF
-nth vaddr bind type lib name 
------------------------------
-EOF
-RUN
-
-
-NAME=Java list imports test.class
-FILE=bins/java/test.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind type  lib                                                name                   
-----------------------------------------------------------------------------------------------------
- 13 ---------- NONE METH  groovy.lang.Script                                 <init>
- 17 ---------- NONE METH  test                                               $getCallSiteArray
- 22 ---------- NONE METH  groovy.lang.Script                                 <init>
- 35 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      call
- 55 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      callConstructor
- 61 ---------- NONE METH  org.codehaus.groovy.runtime.ScriptBytecodeAdapter  createMap
- 67 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      call
- 71 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      callCurrent
- 79 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      callGetProperty
- 92 ---------- NONE IMETH org.codehaus.groovy.runtime.callsite.CallSite      call
-100 ---------- NONE METH  java.lang.Object                                   getClass
-104 ---------- NONE METH  org.codehaus.groovy.runtime.ScriptBytecodeAdapter  initMetaClass
-106 ---------- NONE FIELD test                                               $staticClassInfo
-112 ---------- NONE METH  org.codehaus.groovy.reflection.ClassInfo           getClassInfo
-115 ---------- NONE METH  org.codehaus.groovy.reflection.ClassInfo           getMetaClass
-147 ---------- NONE METH  test                                               $createCallSiteArray_1
-152 ---------- NONE METH  org.codehaus.groovy.runtime.callsite.CallSiteArray <init>
-154 ---------- NONE FIELD test                                               $callSiteArray
-159 ---------- NONE METH  java.lang.ref.SoftReference                        get
-161 ---------- NONE METH  test                                               $createCallSiteArray
-164 ---------- NONE METH  java.lang.ref.SoftReference                        <init>
-168 ---------- NONE FIELD org.codehaus.groovy.runtime.callsite.CallSiteArray array
-EOF
-RUN
-
-
-NAME=Java list imports TryWithResources.class
-FILE=bins/java/TryWithResources.class
-CMDS=ii
-EXPECT=<<EOF
-nth      vaddr bind   type  lib                        name            
------------------------------------------------------------------------
-  2 ---------- NONE   METH  TryWithResources           <init>
-  3 ---------- NONE   METH  java.lang.RuntimeException <init>
-  4 ---------- NONE   FIELD java.lang.System           out
-  6 ---------- NONE   METH  java.lang.StringBuilder    <init>
-  8 ---------- NONE   METH  java.lang.StringBuilder    append
-  9 ---------- NONE   METH  java.lang.StringBuilder    append
- 10 ---------- NONE   METH  java.lang.StringBuilder    toString
- 11 ---------- NONE   METH  java.io.PrintStream        println
- 12 ---------- NONE   FIELD TryWithResources           i
- 14 ---------- NONE   METH  java.io.PrintStream        println
- 15 ---------- NONE   FIELD TryWithResources           $
- 17 ---------- GLOBAL FUNC  TryWithResources           main
- 19 ---------- NONE   METH  TryWithResources           $
- 20 ---------- NONE   METH  java.io.PrintStream        println
- 21 ---------- NONE   METH  TryWithResources           $
- 22 ---------- NONE   METH  TryWithResources           close
- 24 ---------- NONE   METH  java.lang.Throwable        addSuppressed
- 25 ---------- NONE   METH  TryWithResources           $
- 26 ---------- NONE   IMETH java.lang.AutoCloseable    close
- 27 ---------- NONE   METH  java.lang.Throwable        printStackTrace
-  0 ---------- WEAK   IFACE java.lang.AutoCloseable    *
-EOF
-RUN
-
-
-NAME=Java list sections crash2.class
-FILE=bins/java/crash2.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr size      vaddr vsize align perm name                type flags 
----------------------------------------------------------------------------
-0x0000000a 0x12 0x0000000a  0x12   0x0 -r-- class.constant_pool      
-EOF
-RUN
-
-
-NAME=Java list sections DemoTest.class
-FILE=bins/java/DemoTest.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                             type flags 
------------------------------------------------------------------------------------------
-0x0000000a 0x16c 0x0000000a 0x16c   0x0 -r-- class.constant_pool                   
-0x0000017a  0xb6 0x0000017a  0xb6   0x0 -r-- class.methods                         
-0x0000017a  0x29 0x0000017a  0x29   0x0 -r-- class.methods.fun.attr                
-0x00000190  0x1b 0x00000190  0x1b   0x0 -r-x class.methods.fun.attr.0.code         
-0x000001a3  0x2f 0x000001a3  0x2f   0x0 -r-- class.methods._init_.attr             
-0x000001b9  0x21 0x000001b9  0x21   0x0 -r-x class.methods._init_.attr.0.code      
-0x000001d2  0x29 0x000001d2  0x29   0x0 -r-- class.methods.res.attr                
-0x000001e8  0x1b 0x000001e8  0x1b   0x0 -r-x class.methods.res.attr.0.code         
-0x000001fb  0x35 0x000001fb  0x35   0x0 -r-- class.methods.main.attr               
-0x00000211  0x25 0x00000211  0x25   0x0 -r-x class.methods.main.attr.0.code        
-0x00000230   0x8 0x00000230   0x8   0x0 -r-- class.attr                            
-EOF
-RUN
-
-
-NAME=Java list sections ExCaseTableSwitch.class
-FILE=bins/java/ExCaseTableSwitch.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                                            type flags 
---------------------------------------------------------------------------------------------------------
-0x0000000a 0x440 0x0000000a 0x440   0x0 -r-- class.constant_pool                                  
-0x0000044e 0x920 0x0000044e 0x920   0x0 -r-- class.methods                                        
-0x0000044e  0x3d 0x0000044e  0x3d   0x0 -r-- class.methods._init_.attr                            
-0x00000464  0x2f 0x00000464  0x2f   0x0 -r-x class.methods._init_.attr.0.code                     
-0x0000048b 0x13e 0x0000048b 0x13e   0x0 -r-- class.methods.a.attr                                 
-0x000004a1 0x130 0x000004a1 0x130   0x0 -r-x class.methods.a.attr.0.code                          
-0x000005c9  0x44 0x000005c9  0x44   0x0 -r-- class.methods.a_1.attr                               
-0x000005df  0x36 0x000005df  0x36   0x0 -r-x class.methods.a_1.attr.0.code                        
-0x0000060d  0x3a 0x0000060d  0x3a   0x0 -r-- class.methods.a_1.attr_0x60d                         
-0x00000623  0x2c 0x00000623  0x2c   0x0 -r-x class.methods.a_1.attr.0.code_0x623                  
-0x00000647 0x1b9 0x00000647 0x1b9   0x0 -r-- class.methods.hopskip_line_switch.attr               
-0x0000065d 0x1ab 0x0000065d 0x1ab   0x0 -r-x class.methods.hopskip_line_switch.attr.0.code        
-0x00000800 0x1d4 0x00000800 0x1d4   0x0 -r-- class.methods.straight_line_switch.attr              
-0x00000816 0x1c6 0x00000816 0x1c6   0x0 -r-x class.methods.straight_line_switch.attr.0.code       
-0x000009d4 0x1cc 0x000009d4 0x1cc   0x0 -r-- class.methods.straight_line_switch_.attr             
-0x000009ea 0x1be 0x000009ea 0x1be   0x0 -r-x class.methods.straight_line_switch_.attr.0.code      
-0x00000ba0 0x1ce 0x00000ba0 0x1ce   0x0 -r-- class.methods.main.attr                              
-0x00000bb6 0x1be 0x00000bb6 0x1be   0x0 -r-x class.methods.main.attr.0.code                       
-0x00000d6e   0x8 0x00000d6e   0x8   0x0 -r-- class.attr                                           
-EOF
-RUN
-
-
-NAME=Java list sections fuckedup.class
-FILE=bins/java/fuckedup.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr size      vaddr vsize align perm name                type flags 
----------------------------------------------------------------------------
-0x0000000a 0x41 0x0000000a  0x41   0x0 -r-- class.constant_pool      
-EOF
-RUN
-
-
-NAME=Java list sections Hello.class
-FILE=bins/java/Hello.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                             type flags 
------------------------------------------------------------------------------------------
-0x0000000a 0x1ff 0x0000000a 0x1ff   0x0 -r-- class.constant_pool                   
-0x0000020b   0xa 0x0000020b   0xa   0x0 -r-- class.fields.who.attr                 
-0x0000020b   0xa 0x0000020b   0xa   0x0 -r-- class.fields                          
-0x00000215  0xb8 0x00000215  0xb8   0x0 -r-- class.methods                         
-0x00000215  0x38 0x00000215  0x38   0x0 -r-- class.methods._init_.attr             
-0x0000022b  0x2a 0x0000022b  0x2a   0x0 -r-x class.methods._init_.attr.0.code      
-0x0000024d  0x47 0x0000024d  0x47   0x0 -r-- class.methods.say.attr                
-0x00000263  0x39 0x00000263  0x39   0x0 -r-x class.methods.say.attr.0.code         
-0x00000294  0x39 0x00000294  0x39   0x0 -r-- class.methods.main.attr               
-0x000002aa  0x29 0x000002aa  0x29   0x0 -r-x class.methods.main.attr.0.code        
-0x000002cd   0x8 0x000002cd   0x8   0x0 -r-- class.attr                            
-EOF
-RUN
-
-
-NAME=Java list sections HiKt.class
-FILE=bins/java/HiKt.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                           type flags 
----------------------------------------------------------------------------------------
-0x0000000a 0x201 0x0000000a 0x201   0x0 -r-- class.constant_pool                 
-0x0000020f  0x4e 0x0000020f  0x4e   0x0 -r-- class.methods                       
-0x0000020f  0x4e 0x0000020f  0x4e   0x0 -r-- class.methods.main.attr             
-0x00000225  0x31 0x00000225  0x31   0x0 -r-x class.methods.main.attr.0.code      
-0x0000025d  0x54 0x0000025d  0x54   0x0 -r-- class.attr                          
-EOF
-RUN
-
-
-NAME=Java list sections invisible.class
-FILE=bins/java/invisible.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                           type flags 
----------------------------------------------------------------------------------------
-0x0000000a 0x100 0x0000000a 0x100   0x0 -r-- class.constant_pool                 
-0x0000010e  0x21 0x0000010e  0x21   0x0 -r-- class.methods                       
-0x0000010e  0x21 0x0000010e  0x21   0x0 -r-- class.methods.main.attr             
-0x00000120  0x11 0x00000120  0x11   0x0 -r-x class.methods.main.attr.0.code      
-EOF
-RUN
-
-
-NAME=Java list sections jdwpexeccmd.class
-FILE=bins/java/jdwpexeccmd.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                             type flags 
------------------------------------------------------------------------------------------
-0x0000000a 0x315 0x0000000a 0x315   0x0 -r-- class.constant_pool                   
-0x00000323 0x124 0x00000323 0x124   0x0 -r-- class.methods                         
-0x00000323  0x2b 0x00000323  0x2b   0x0 -r-- class.methods._init_.attr             
-0x00000339  0x1d 0x00000339  0x1d   0x0 -r-x class.methods._init_.attr.0.code      
-0x0000034e  0xf9 0x0000034e  0xf9   0x0 -r-- class.methods.run.attr                
-0x00000364  0xe9 0x00000364  0xe9   0x0 -r-x class.methods.run.attr.0.code         
-0x00000447   0x8 0x00000447   0x8   0x0 -r-- class.attr                            
-EOF
-RUN
-
-
-NAME=Java list sections MainActivity.class
-FILE=bins/java/MainActivity.class
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr   size      vaddr  vsize align perm name                                            type flags 
 ----------------------------------------------------------------------------------------------------------
 0x0000000a 0x1c13 0x0000000a 0x1c13   0x0 -r-- class.constant_pool                                  
@@ -1312,106 +1115,28 @@ EXPECT=<<EOF
 EOF
 RUN
 
-
-NAME=Java list sections Main.class
-FILE=bins/java/Main.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                             type flags 
------------------------------------------------------------------------------------------
-0x0000000a 0x365 0x0000000a 0x365   0x0 -r-- class.constant_pool                   
-0x00000373 0x109 0x00000373 0x109   0x0 -r-- class.methods                         
-0x00000373  0x2b 0x00000373  0x2b   0x0 -r-- class.methods._init_.attr             
-0x00000389  0x1d 0x00000389  0x1d   0x0 -r-x class.methods._init_.attr.0.code      
-0x0000039e  0xde 0x0000039e  0xde   0x0 -r-- class.methods.main.attr               
-0x000003b4  0xce 0x000003b4  0xce   0x0 -r-x class.methods.main.attr.0.code        
-0x0000047c   0x8 0x0000047c   0x8   0x0 -r-- class.attr                            
-EOF
-RUN
-
-
-NAME=Java list sections sjybq.class
+NAME=Java sjybq.class
 FILE=bins/java/sjybq.class
-CMDS=iS
+CMDS=<<EOF
+is
+echo ---
+ic
+echo ---
+ii
+echo ---
+iS
+EOF
 EXPECT=<<EOF
+nth paddr vaddr bind type size lib name 
+----------------------------------------
+---
+address min max name super 
+---------------------------
+---
+nth vaddr bind type lib name 
+-----------------------------
+---
 paddr size vaddr vsize align perm name type flags 
 --------------------------------------------------
 EOF
 RUN
-
-
-NAME=Java list sections test.class
-FILE=bins/java/test.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name                                             type flags 
----------------------------------------------------------------------------------------------------------
-0x0000000a 0x8bd 0x0000000a 0x8bd   0x0 -r-- class.constant_pool                                   
-0x000008c9   0x8 0x000008c9   0x8   0x0 -r-- class.fields._staticClassInfo.attr                    
-0x000008d1   0x8 0x000008d1   0x8   0x0 -r-- class.fields.___stMC.attr                             
-0x000008d9   0xa 0x000008d9   0xa   0x0 -r-- class.fields._callSiteArray.attr                      
-0x000008c9  0x1a 0x000008c9  0x1a   0x0 -r-- class.fields                                          
-0x000008e3 0x2e4 0x000008e3 0x2e4   0x0 -r-- class.methods                                         
-0x000008e3  0x35 0x000008e3  0x35   0x0 -r-- class.methods._init_.attr                             
-0x000008f9  0x27 0x000008f9  0x27   0x0 -r-x class.methods._init_.attr.0.code                      
-0x00000918  0x40 0x00000918  0x40   0x0 -r-- class.methods._init__1.attr                           
-0x0000092e  0x32 0x0000092e  0x32   0x0 -r-x class.methods._init__1.attr.0.code                    
-0x00000958  0x40 0x00000958  0x40   0x0 -r-- class.methods.main.attr                               
-0x0000096e  0x32 0x0000096e  0x32   0x0 -r-x class.methods.main.attr.0.code                        
-0x00000998 0x10c 0x00000998 0x10c   0x0 -r-- class.methods.run.attr                                
-0x000009ae  0xfe 0x000009ae  0xfe   0x0 -r-x class.methods.run.attr.0.code                         
-0x00000aa4  0x41 0x00000aa4  0x41   0x0 -r-- class.methods._getStaticMetaClass.attr                
-0x00000aba  0x33 0x00000aba  0x33   0x0 -r-x class.methods._getStaticMetaClass.attr.0.code         
-0x00000ae5  0x6f 0x00000ae5  0x6f   0x0 -r-- class.methods._createCallSiteArray_1.attr             
-0x00000afb  0x61 0x00000afb  0x61   0x0 -r-x class.methods._createCallSiteArray_1.attr.0.code      
-0x00000b54  0x2f 0x00000b54  0x2f   0x0 -r-- class.methods._createCallSiteArray.attr               
-0x00000b6a  0x21 0x00000b6a  0x21   0x0 -r-x class.methods._createCallSiteArray.attr.0.code        
-0x00000b83  0x44 0x00000b83  0x44   0x0 -r-- class.methods._getCallSiteArray.attr                  
-0x00000b99  0x34 0x00000b99  0x34   0x0 -r-x class.methods._getCallSiteArray.attr.0.code           
-0x00000bc7   0x8 0x00000bc7   0x8   0x0 -r-- class.attr                                            
-EOF
-RUN
-
-
-NAME=Java list sections TryWithResources.class
-FILE=bins/java/TryWithResources.class
-CMDS=iS
-EXPECT=<<EOF
-     paddr   size      vaddr  vsize align perm name                                type flags 
-----------------------------------------------------------------------------------------------
-0x0000000a  0x3eb 0x0000000a  0x3eb   0x0 -r-- class.constant_pool                      
-0x000003f5    0x4 0x000003f5    0x4   0x0 -r-- class.interfaces                         
-0x000003f9    0x8 0x000003f9    0x8   0x0 -r-- class.fields._.attr                      
-0x00000401    0xa 0x00000401    0xa   0x0 -r-- class.fields.i.attr                      
-0x000003f9   0x12 0x000003f9   0x12   0x0 -r-- class.fields                             
-0x0000040b 0x4b20 0x0000040b 0x4b20   0x0 -r-- class.methods                            
-0x0000040b   0x23 0x0000040b   0x23   0x0 -r-- class.methods._.attr                     
-0x00000421   0x15 0x00000421   0x15   0x0 -r-x class.methods._.attr.0.code              
-0x0000042e   0x40 0x0000042e   0x40   0x0 -r-- class.methods._init_.attr                
-0x00000444   0x32 0x00000444   0x32   0x0 -r-x class.methods._init_.attr.0.code         
-0x0000046e   0x4c 0x0000046e   0x4c   0x0 -r-- class.methods.close.attr                 
-0x00000484   0x3e 0x00000484   0x3e   0x0 -r-x class.methods.close.attr.0.code          
-0x000004ba   0x2b 0x000004ba   0x2b   0x0 -r-- class.methods.__1.attr                   
-0x000004d0   0x1d 0x000004d0   0x1d   0x0 -r-x class.methods.__1.attr.0.code            
-0x000004e5   0x22 0x000004e5   0x22   0x0 -r-- class.methods.__1.attr_0x4e5             
-0x000004fb   0x14 0x000004fb   0x14   0x0 -r-x class.methods.__1.attr.0.code_0x4fb      
-0x00000507   0x2f 0x00000507   0x2f   0x0 -r-- class.methods.main.attr                  
-0x0000051d   0x17 0x0000051d   0x17   0x0 -r-x class.methods.main.attr.0.code           
-0x00000536 0x49cd 0x00000536 0x49cd   0x0 -r-- class.methods.main_1.attr                
-0x0000054c 0x49bf 0x0000054c 0x49bf   0x0 -r-x class.methods.main_1.attr.0.code         
-0x00004f03   0x28 0x00004f03   0x28   0x0 -r-- class.methods._clinit_.attr              
-0x00004f19   0x18 0x00004f19   0x18   0x0 -r-x class.methods._clinit_.attr.0.code       
-EOF
-RUN
-
-NAME=Java list exports HiKt.class
-FILE=bins/java/HiKt.class
-CMDS=iE
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type size lib  name                
---------------------------------------------------------------------
-  0 0x00000225 0x00000225 GLOBAL FUNC   49 HiKt void main(String[])
-EOF
-RUN
-
-
diff --git a/test/db/formats/le b/test/db/formats/le
index b34bf4c493..5f05321305 100644
--- a/test/db/formats/le
+++ b/test/db/formats/le
@@ -1,88 +1,12 @@
 NAME=Open LE cdogs.exe
 FILE=bins/le/cdogs.exe
-CMDS=iH
-EXPECT=<<EOF
-le:
-  signature: "LE"
-  le_offset: 0x2d98
-  byte_order: "little endian"
-  word_order: "little endian"
-  format_level: 0
-  module_name: "cdogs"
-  type: "Program module (EXE)"
-  cpu: "80386"
-  os: "OS/2"
-  arch: "x86"
-  version: 0
-  mflags: 0x200
-  flags:
-    - "PMWINAPI"
-    - "EXE"
-  mpages: 61
-  initial_eip_obj: 1
-  initial_eip: 0x16058
-  initial_stack_obj: 2
-  initial_esp: 0x26030
-  page_size: 0x1000
-  last_page_size: 0xd8c
-  fixup_size: 0xa14a
-  fixup_checksum: 0x0
-  loader_size: 0xa278
-  loader_checksum: 0x0
-  obj_table: 0xc4
-  obj_count: 2
-  obj_page_map: 0xf4
-  obj_iter_data_map: 0x0
-  resource_table: 0x1e8
-  resource_count: 0
-  resident_name_table: 0x1e8
-  entry_table: 0x1f1
-  directives_table: 0x0
-  directives_count: 0
-  fixup_page_table: 0x1f2
-  fixup_record_table: 0x2ea
-  import_module_name_table: 0xa33b
-  import_module_name_count: 0
-  import_procedure_name_table: 0xa33b
-  per_page_checksum_table: 0x0
-  enumerated_data_pages: 0xd200
-  number_of_preload_pages: 0
-  non_resident_names_table: 0x0
-  size_non_resident_names: 0
-  checksum_non_resident_names: 0x0
-  autodata_obj: 2
-  debug_info: 0x0
-  debug_length: 0x0
-  preload_pages: 0
-  demand_pages: 0
-  heap_size: 0x0
-  stack_size: 0x0
-
-EOF
-RUN
-
-NAME=cdogs.exe entrypoint
-FILE=bins/le/cdogs.exe
-CMDS=ie:vaddr:quiet
-EXPECT=<<EOF
-0x00026058
-EOF
-RUN
-
-NAME=cdogs.exe sections
-FILE=bins/le/cdogs.exe
-CMDS=iS
-EXPECT=<<EOF
-     paddr    size      vaddr   vsize align perm name   type flags 
--------------------------------------------------------------------
-0x0000d200 0x2d000 0x00010000 0x2d000   0x0 -r-x obj1_1      
-0x0003a200  0xfd8c 0x00040000 0x26030   0x0 -rw- obj2_1      
-EOF
-RUN
-
-NAME=cdogs.exe relocations
-FILE=bins/le/cdogs.exe
 CMDS=<<EOF
+iH
+echo ---
+ie:vaddr:quiet
+echo ---
+iS
+echo ---
 ir > $relocs
 cat $relocs~?
 cat $relocs~0x00010~?
@@ -149,8 +73,80 @@ cat $relocs~0x0004c~?
 cat $relocs~0x0004d~?
 cat $relocs~0x0004e~?
 cat $relocs~0x0004f~?
+echo ---
+aac
+# aaef
+aflc
+echo ---
+s
+echo ---
+pi 1
 EOF
 EXPECT=<<EOF
+le:
+  signature: "LE"
+  le_offset: 0x2d98
+  byte_order: "little endian"
+  word_order: "little endian"
+  format_level: 0
+  module_name: "cdogs"
+  type: "Program module (EXE)"
+  cpu: "80386"
+  os: "OS/2"
+  arch: "x86"
+  version: 0
+  mflags: 0x200
+  flags:
+    - "PMWINAPI"
+    - "EXE"
+  mpages: 61
+  initial_eip_obj: 1
+  initial_eip: 0x16058
+  initial_stack_obj: 2
+  initial_esp: 0x26030
+  page_size: 0x1000
+  last_page_size: 0xd8c
+  fixup_size: 0xa14a
+  fixup_checksum: 0x0
+  loader_size: 0xa278
+  loader_checksum: 0x0
+  obj_table: 0xc4
+  obj_count: 2
+  obj_page_map: 0xf4
+  obj_iter_data_map: 0x0
+  resource_table: 0x1e8
+  resource_count: 0
+  resident_name_table: 0x1e8
+  entry_table: 0x1f1
+  directives_table: 0x0
+  directives_count: 0
+  fixup_page_table: 0x1f2
+  fixup_record_table: 0x2ea
+  import_module_name_table: 0xa33b
+  import_module_name_count: 0
+  import_procedure_name_table: 0xa33b
+  per_page_checksum_table: 0x0
+  enumerated_data_pages: 0xd200
+  number_of_preload_pages: 0
+  non_resident_names_table: 0x0
+  size_non_resident_names: 0
+  checksum_non_resident_names: 0x0
+  autodata_obj: 2
+  debug_info: 0x0
+  debug_length: 0x0
+  preload_pages: 0
+  demand_pages: 0
+  heap_size: 0x0
+  stack_size: 0x0
+
+---
+0x00026058
+---
+     paddr    size      vaddr   vsize align perm name   type flags 
+-------------------------------------------------------------------
+0x0000d200 0x2d000 0x00010000 0x2d000   0x0 -r-x obj1_1      
+0x0003a200  0xfd8c 0x00040000 0x26030   0x0 -rw- obj2_1      
+---
 5237
 151
 160
@@ -216,12 +212,28 @@ EXPECT=<<EOF
 381
 561
 588
+---
+789
+---
+0x26058
+---
+jmp 0x260d0
 EOF
 RUN
 
 NAME=Open LX GCC.EXE
 FILE=bins/le/GCC.EXE
-CMDS=iH
+CMDS=<<EOF
+iH
+echo ---
+ie:vaddr:quiet
+echo ---
+iS
+echo ---
+ir
+echo ---
+il
+EOF
 EXPECT=<<EOF
 le:
   signature: "LX"
@@ -280,34 +292,16 @@ le:
   heap_size: 0x0
   stack_size: 0x0
 
-EOF
-RUN
-
-NAME=GCC.EXE entrypoint
-FILE=bins/le/GCC.EXE
-CMDS=ie:vaddr:quiet
-EXPECT=<<EOF
+---
 0x00010000
-EOF
-RUN
-
-NAME=GCC.EXE sections
-FILE=bins/le/GCC.EXE
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr   size      vaddr     vsize align perm name   type flags 
 --------------------------------------------------------------------
 0x00001000 0xf000 0x00010000    0xf000   0x0 -r-x obj1_1      
 0x00010000 0x1000 0x00020000    0x2804   0x0 -rw- obj2_1      
 0x00000000    0x0 0x00030000 0x2000000   0x0 -rw- obj3_1      
 0x00000000    0x0 0x02030000  0x800000   0x0 -rw- obj4_1      
-EOF
-RUN
-
-NAME=GCC.EXE relocations
-FILE=bins/le/GCC.EXE
-CMDS=ir
-EXPECT=<<EOF
+---
      vaddr      paddr     target type   name         
 -----------------------------------------------------
 0x00010006 0x00001006 0x02832000 SET_32 emx_1
@@ -321,13 +315,7 @@ EXPECT=<<EOF
 0x0001d39f 0x0000e39f 0x02832018 SET_32 doscalls_257
 0x0001d3d9 0x0000e3d9 0x02832020 SET_32 doscalls_281
 0x0001d3f4 0x0000e3f4 0x02832018 SET_32 doscalls_257
-EOF
-RUN
-
-NAME=GCC.EXE linked libs
-FILE=bins/le/GCC.EXE
-CMDS=il
-EXPECT=<<EOF
+---
 library  
 ---------
 emx
@@ -337,7 +325,23 @@ RUN
 
 NAME=Open LX GNUGREP.DLL
 FILE=bins/le/GNUGREP.DLL
-CMDS=iH
+CMDS=<<EOF
+iH
+echo ---
+ie:vaddr:quiet
+echo ---
+is
+echo ---
+iS
+echo ---
+il
+echo ---
+ir > $relocs
+cat $relocs~?
+cat $relocs~GNUREGEX~?
+cat $relocs~EMXLIBC~?
+cat $relocs~emx~?
+EOF
 EXPECT=<<EOF
 le:
   signature: "LX"
@@ -394,22 +398,10 @@ le:
   heap_size: 0x0
   stack_size: 0x0
 
-EOF
-RUN
-
-NAME=GNUGREP.DLL entrypoint
-FILE=bins/le/GNUGREP.DLL
-CMDS=ie:vaddr:quiet
-EXPECT=<<EOF
+---
 0x00010000
 0x00010ddc
-EOF
-RUN
-
-NAME=GNUGREP.DLL symbol
-FILE=bins/le/GNUGREP.DLL
-CMDS=is
-EXPECT=<<EOF
+---
 nth      paddr      vaddr bind   type size lib name            
 ---------------------------------------------------------------
   1 0x000023dc 0x00010ddc GLOBAL UNK     0     grepmain
@@ -454,44 +446,20 @@ nth      paddr      vaddr bind   type size lib name
  40 0x00000000 0x00043098 GLOBAL UNK     0     imp.GNUREGEX_9
  41 0x00000000 0x0004309c GLOBAL UNK     0     imp.GNUREGEX_12
  42 0x00000000 0x000430a0 GLOBAL UNK     0     imp.EMXLIBC_207
-EOF
-RUN
-
-NAME=GNUGREP.DLL sections
-FILE=bins/le/GNUGREP.DLL
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr   size      vaddr  vsize align perm name   type flags 
 -----------------------------------------------------------------
 0x00001600 0x7e00 0x00010000 0x8000   0x0 -r-x obj1_1      
 0x00009400  0x200 0x00020000 0x1000   0x0 -r-x obj2_1      
 0x00009600  0x200 0x00030000 0x1000   0x0 -r-x obj3_1      
 0x00001400  0x200 0x00040000 0x1000   0x0 -rw- obj4_1      
-EOF
-RUN
-
-NAME=GNUGREP.DLL linked libs
-FILE=bins/le/GNUGREP.DLL
-CMDS=il
-EXPECT=<<EOF
+---
 library  
 ---------
 GNUREGEX
 EMXLIBC
 emx
-EOF
-RUN
-
-NAME=GNUGREP.DLL relocations
-FILE=bins/le/GNUGREP.DLL
-CMDS=<<EOF
-ir > $relocs
-cat $relocs~?
-cat $relocs~GNUREGEX~?
-cat $relocs~EMXLIBC~?
-cat $relocs~emx~?
-EOF
-EXPECT=<<EOF
+---
 1168
 8
 183
@@ -499,37 +467,9 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=LE: corkami cdogs.exe - open
-FILE=bins/le/cdogs.exe
-TIMEOUT=1320
-CMDS=<<EOF
-aac
-# aaef
-aflc
-EOF
-EXPECT=<<EOF
-789
-EOF
-RUN
-
-NAME=LE: corkami cdogs.exe - entrypoint
-FILE=bins/le/cdogs.exe
-CMDS=s
-EXPECT=<<EOF
-0x26058
-EOF
-RUN
-
-NAME=LE: corkami cdogs.exe - pi 1
-FILE=bins/le/cdogs.exe
-CMDS=pi 1
-EXPECT=<<EOF
-jmp 0x260d0
-EOF
-RUN
-
 NAME=DOSEXT.EXE open extender binary
 FILE=bins/le/DOSEXT.EXE
+BROKEN=1
 CMDS=iH
 EXPECT=<<EOF
 le:
@@ -590,7 +530,6 @@ le:
   stack_size: 0x1000
 
 EOF
-BROKEN=1
 RUN
 
 NAME=hellolx.dll unpack iterated page
@@ -601,34 +540,24 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=sdl.dll unpack compressed page
+NAME=sdl.dll
 FILE=bins/le/sdl.dll
-CMDS=p8 8 @ 0x20000
+CMDS=<<EOF
+p8 8 @ 0x20000
+echo ---
+p8 6 @ 0x1000B
+echo ---
+p8 4 @ 0x202bd
+echo ---
+p8 4 @ 0x20b32
+EOF
 EXPECT=<<EOF
 ccebfd9090909000
-EOF
-RUN
-
-NAME=sdl.dll 16:32 fixup
-FILE=bins/le/sdl.dll
-CMDS=p8 6 @ 0x1000B
-EXPECT=<<EOF
+---
 595005000200
-EOF
-RUN
-
-NAME=sdl.dll 32 bit relative fixup
-FILE=bins/le/sdl.dll
-CMDS=p8 4 @ 0x202bd
-EXPECT=<<EOF
+---
 3fad0500
-EOF
-RUN
-
-NAME=sdl.dll 32 bit absolute fixup
-FILE=bins/le/sdl.dll
-CMDS=p8 4 @ 0x20b32
-EXPECT=<<EOF
+---
 69010600
 EOF
 RUN
diff --git a/test/db/formats/luac/luac53 b/test/db/formats/luac/luac53
index 5d4cb1458c..4e82e86710 100644
--- a/test/db/formats/luac/luac53
+++ b/test/db/formats/luac/luac53
@@ -1,4 +1,4 @@
-NAME=LUAC: info
+NAME=LUAC: none53.luac
 FILE=bins/luac/none53.luac
 CMDS=<<EOF
 i~guid,machine
@@ -12,7 +12,7 @@ machine  Lua 5.3 VM
 EOF
 RUN
 
-NAME=LUAC: big file
+NAME=LUAC: big53.luac
 FILE=bins/luac/big53.luac
 CMDS=<<EOF
 iS~code
diff --git a/test/db/formats/mdmp b/test/db/formats/mdmp
index 6b51a5b41d..1d64be0dbd 100644
--- a/test/db/formats/mdmp
+++ b/test/db/formats/mdmp
@@ -1,15 +1,20 @@
-NAME=mdmp open
+NAME=mdmp calc.dmp
 FILE=bins/mdmp/calc.dmp
-CMDS=i~format
+CMDS=<<EOF
+i~format
+echo ---
+iI
+echo ---
+oml
+echo ---
+ie
+echo ---
+obR
+echo ok
+EOF
 EXPECT=<<EOF
 format   mdmp
-EOF
-RUN
-
-NAME=mdmp info
-FILE=bins/mdmp/calc.dmp
-CMDS=iI
-EXPECT=<<EOF
+---
 arch     x86
 cpu      N/A
 features N/A
@@ -46,6 +51,21 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
+ 1 fd: 3 +0x000043ac 0x0398f9b8 - 0x0398ffff r-- fmap.memory.0x398f9b8
+ 2 fd: 3 +0x000049f4 0x77639dea - 0x77639ee9 r-- fmap.memory.0x77639dea
+ 3 fd: 3 +0x00004af4 0x032cf638 - 0x032cffff r-- fmap.memory.0x32cf638
+ 4 fd: 3 +0x000054bc 0x0367f868 - 0x0367ffff r-- fmap.memory.0x367f868
+ 5 fd: 3 +0x00005c54 0x000bd0d8 - 0x000bffff r-- fmap.memory.0xbd0d8
+ 6 fd: 3 +0x00008b7c 0x03a7ff08 - 0x03a7ffff r-- fmap.memory.0x3a7ff08
+ 7 fd: 3 +0x00008c74 0x7776ad90 - 0x7776ae8f r-- fmap.memory.0x7776ad90
+ 8 fd: 3 +0x00008d74 0x7776bafa - 0x7776bbf9 r-- fmap.memory.0x7776bafa
+ 9 fd: 3 +0x00008e74 0x7776c06a - 0x7776c169 r-- fmap.memory.0x7776c06a
+---
+vaddr paddr hvaddr haddr type 
+------------------------------
+---
+ok
 EOF
 RUN
 
@@ -84,25 +104,51 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=mdmp maps
-FILE=bins/mdmp/calc.dmp
-CMDS=oml
-EXPECT=<<EOF
- 1 fd: 3 +0x000043ac 0x0398f9b8 - 0x0398ffff r-- fmap.memory.0x398f9b8
- 2 fd: 3 +0x000049f4 0x77639dea - 0x77639ee9 r-- fmap.memory.0x77639dea
- 3 fd: 3 +0x00004af4 0x032cf638 - 0x032cffff r-- fmap.memory.0x32cf638
- 4 fd: 3 +0x000054bc 0x0367f868 - 0x0367ffff r-- fmap.memory.0x367f868
- 5 fd: 3 +0x00005c54 0x000bd0d8 - 0x000bffff r-- fmap.memory.0xbd0d8
- 6 fd: 3 +0x00008b7c 0x03a7ff08 - 0x03a7ffff r-- fmap.memory.0x3a7ff08
- 7 fd: 3 +0x00008c74 0x7776ad90 - 0x7776ae8f r-- fmap.memory.0x7776ad90
- 8 fd: 3 +0x00008d74 0x7776bafa - 0x7776bbf9 r-- fmap.memory.0x7776bafa
- 9 fd: 3 +0x00008e74 0x7776c06a - 0x7776c169 r-- fmap.memory.0x7776c06a
-EOF
-RUN
-
-NAME=mdmp memory64 maps
+NAME=mdmp hello64.dmp
 FILE=bins/mdmp/hello64.dmp
-CMDS=oml
+CMDS=<<EOF
+oml
+echo ---
+il:quiet~?
+echo ---
+il~kernel32.dll
+echo ---
+ie:quiet~?
+echo ---
+ie~0x00401500
+echo ---
+is~?
+echo ---
+is~imp.DeleteCriticalSection~KERNEL32.dll
+echo ---
+is~A_SHAFinal
+echo ---
+ii~?
+echo ---
+ii~KERNEL32.dll~GetCurrentProcessId
+echo ---
+iE~?
+echo ---
+iE~CsrVerifyRegion
+echo ---
+iz~0x002e2fe1[1,2,3,4,5,6,7,8]
+iz~0x002e2feb[1,2,3,4,5,6,7,8]
+iz~0x002e2ff5[1,2,3,4,5,6,7,8]
+iz~0x00330d85[1,2,3,4,5,6,7,8]
+iz~0x003310c1[1,2,3,4,5,6,7,8]
+iz~0x00161a37[1,2,3,4,5,6,7,8]
+iz~0x00161c7f[1,2,3,4,5,6,7,8]
+iz~0x00161dbf[1,2,3,4,5,6,7,8]
+iz~0x001d9d45[1,2,3,4,5,6,7,8]
+iz~0x001da0a5[1,2,3,4,5,6,7,8]
+iz~0x003fad45[1,2,3,4,5,6,7,8]
+iz~0x003fb0ad[1,2,3,4,5,6,7,8]
+iz~0x00480857[1,2,3,4,5,6,7,8]
+iz~0x004808c7[1,2,3,4,5,6,7,8]
+iz~0x00499cf5[1,2,3,4,5,6,7,8]
+iz~0x0049a045[1,2,3,4,5,6,7,8]
+EOF
+TIMEOUT=2040
 EXPECT=<<EOF
  1 fd: 3 +0x00002c8f 0x00010000 - 0x0001ffff r-- fmap.memory64.0x10000
  2 fd: 3 +0x00012c8f 0x00020000 - 0x0002ffff r-- fmap.memory64.0x20000
@@ -157,27 +203,145 @@ EXPECT=<<EOF
 51 fd: 3 +0x0049cc8f 0x7fffffb0000 - 0x7fffffd2fff r-- fmap.memory64.0x7fffffb0000
 52 fd: 3 +0x004bfc8f 0x7fffffd7000 - 0x7fffffd7fff r-- fmap.memory64.0x7fffffd7000
 53 fd: 3 +0x004c0c8f 0x7fffffde000 - 0x7fffffdffff r-- fmap.memory64.0x7fffffde000
+---
+49
+---
+[0x00400000] - kernel32.dll
+---
+5
+---
+   0x00401500 0x0009418f ---------- 0x00092d37 program
+---
+6826
+---
+   1 0x0009ae8b    0x004081fc NONE   FUNC    0 KERNEL32.dll                                  imp.DeleteCriticalSection
+---
+   9 0x001eb87f    0x77728bf0 GLOBAL FUNC    0 ntdll.dll                                     A_SHAFinal
+---
+1511
+---
+  4    0x00408214 NONE FUNC KERNEL32.dll                                  GetCurrentProcessId
+---
+5317
+---
+  39 0x0029513f    0x777d24b0 GLOBAL FUNC    0 ntdll.dll      CsrVerifyRegion
+---
+0x77820352 4 10 C:_Windows_System32__tdll.dll utf16le Alpc
+0x7782035c 4 10 C:_Windows_System32__tdll.dll utf16le Pool
+0x77820366 5 12 C:_Windows_System32__tdll.dll utf16le Timer
+0x7786e0f6 15 32 C:_Windows_System32__tdll.dll utf16le VS_VERSION_INFO
+0x7786e432 11 24 C:_Windows_System32__tdll.dll utf16le VarFileInfo
+0x7759dda8 7 16 C:_Windows_System32_kernel32.dll utf16le win.ini
+0x7759dff0 20 42 C:_Windows_System32_kernel32.dll utf16le \Classes\Wow6432Node
+0x7759e130 45 92 C:_Windows_System32_kernel32.dll utf16le \REGISTRY\USER\*\SOFTWARE\Classes\Wow6432Node
+0x776160b6 15 32 C:_Windows_System32_kernel32.dll utf16le VS_VERSION_INFO
+0x77616416 11 24 C:_Windows_System32_kernel32.dll utf16le VarFileInfo
+0x7fefd5080b6 15 32 C:_Windows_System32_KERNELBASE.dll utf16le VS_VERSION_INFO
+0x7fefd50841e 11 24 C:_Windows_System32_KERNELBASE.dll utf16le VarFileInfo
+0x7fefdb33bc8 4 10 C:_Windows_System32_msvcrt.dll utf16le PATH
+0x7fefdb33c38 10 22 C:_Windows_System32_msvcrt.dll utf16le SystemRoot
+0x7fefdb4d066 15 32 C:_Windows_System32_msvcrt.dll utf16le VS_VERSION_INFO
+0x7fefdb4d3b6 11 24 C:_Windows_System32_msvcrt.dll utf16le VarFileInfo
 EOF
 RUN
 
-NAME=mdmp entrypoints nomem .dmp
-FILE=bins/mdmp/calc.dmp
-CMDS=ie
-EXPECT=<<EOF
-vaddr paddr hvaddr haddr type 
-------------------------------
-EOF
-RUN
-
-NAME=mdmp resolve vaddr to paddr
+NAME=mdmp hello.dmp
 FILE=bins/mdmp/hello.dmp
-CMDS=px 64 @ 0x00400000
+CMDS=<<EOF
+px 64 @ 0x00400000
+echo ---
+il:quiet~?
+echo ---
+il~kernel32.dll
+echo ---
+ie:quiet~?
+iee:quiet~?
+echo ---
+ie~0x004014e0
+echo ---
+is~?
+echo ---
+is~DeleteCriticalSection:0
+echo ---
+is~RtlDeleteCriticalSection:0
+echo ---
+ii~?
+echo ---
+ii~TerminateProcess~KERNEL32.dll
+echo ---
+iE~?
+echo ---
+iE~Ordinal_1
+echo ---
+iz~0x0043cf24[1,2,3,4,5,6,7,8]
+iz~0x0043cf2e[1,2,3,4,5,6,7,8]
+iz~0x0043cf38[1,2,3,4,5,6,7,8]
+iz~0x00447247[1,2,3,4,5,6,7,8]
+iz~0x0044726b[1,2,3,4,5,6,7,8]
+iz~0x00447291[1,2,3,4,5,6,7,8]
+iz~0x004472ac[1,2,3,4,5,6,7,8]
+iz~0x0048acc8[1,2,3,4,5,6,7,8]
+iz~0x0048b004[1,2,3,4,5,6,7,8]
+iz~0x00168c38[1,2,3,4,5,6,7,8]
+iz~0x00168f80[1,2,3,4,5,6,7,8]
+iz~0x00128c38[1,2,3,4,5,6,7,8]
+iz~0x00128fa8[1,2,3,4,5,6,7,8]
+iz~0x000cdc38[1,2,3,4,5,6,7,8]
+iz~0x000cdf84[1,2,3,4,5,6,7,8]
+iz~0x00299106[1,2,3,4,5,6,7,8]
+iz~0x001adff0[1,2,3,4,5,6,7,8]
+iz~0x0033641a[1,2,3,4,5,6,7,8]
+iz~0x00337f88[1,2,3,4,5,6,7,8]
+EOF
 EXPECT=<<EOF
 - offset -   0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
 0x00400000  4d5a 9000 0300 0000 0400 0000 ffff 0000  MZ..............
 0x00400010  b800 0000 0000 0000 4000 0000 0000 0000  ........@.......
 0x00400020  0000 0000 0000 0000 0000 0000 0000 0000  ................
 0x00400030  0000 0000 0000 0000 0000 0000 8000 0000  ................
+---
+57
+---
+[0x00400000] - kernel32.dll
+---
+11
+2
+---
+0x004014e0 0x000990b2 ---------- 0x00097c7a program
+---
+7468
+---
+   1 0x0009dcda 0x00406108 NONE   FUNC    0 KERNEL32.dll                                  imp.DeleteCriticalSection
+---
+ 358 0x001c2176 0x76fb05a4 NONE   FUNC    0 ntdll.dll                                     imp.RtlDeleteCriticalSection
+---
+2030
+---
+ 17 0x00406148 NONE FUNC KERNEL32.dll                                  TerminateProcess
+---
+5440
+---
+   1 0x0041f1f2 0x77802620 GLOBAL FUNC    0 ntdll.dll      Ordinal_1
+---
+0x77820352 4 10 C:_Windows_System32__tdll.dll utf16le Alpc
+0x7782035c 4 10 C:_Windows_System32__tdll.dll utf16le Pool
+0x77820366 5 12 C:_Windows_System32__tdll.dll utf16le Timer
+0x7782a675 35 36 C:_Windows_System32__tdll.dll ascii RtlFindActivationContextSectionGuid
+0x7782a699 37 38 C:_Windows_System32__tdll.dll ascii RtlFindActivationContextSectionString
+0x7782a6bf 26 27 C:_Windows_System32__tdll.dll ascii RtlFindCharInUnicodeString
+0x7782a6da 16 17 C:_Windows_System32__tdll.dll ascii RtlFindClearBits
+0x7786e0f6 15 32 C:_Windows_System32__tdll.dll utf16le VS_VERSION_INFO
+0x7786e432 11 24 C:_Windows_System32__tdll.dll utf16le VarFileInfo
+0x7500d066 15 32 C:_Windows_System32_wow64.dll utf16le VS_VERSION_INFO
+0x7500d3ae 11 24 C:_Windows_System32_wow64.dll utf16le VarFileInfo
+0x74fc9066 15 32 C:_Windows_System32_wow64win.dll utf16le VS_VERSION_INFO
+0x74fc93d6 11 24 C:_Windows_System32_wow64win.dll utf16le VarFileInfo
+0x74f66066 15 32 C:_Windows_System32_wow64cpu.dll utf16le VS_VERSION_INFO
+0x74f663b2 11 24 C:_Windows_System32_wow64cpu.dll utf16le VarFileInfo
+0x77378534 11 12 C:_Windows_SysWOW64_kernel32.dll ascii _vfprintf_l
+0x75d9341e 11 24 C:_Windows_SysWOW64_KERNELBASE.dll utf16le VarFileInfo
+0x77415848 39 40 C:_Windows_SysWOW64_msvcrt.dll ascii Assertion failed: %s
+0x774173b6 11 24 C:_Windows_SysWOW64_msvcrt.dll utf16le VarFileInfo
 EOF
 RUN
 
@@ -209,281 +373,3 @@ mdmp_token_info_list "dddd TokenListSize TokenListEntries ListHeaderSize Element
 mdmp_vs_fixedfileinfo "ddddddddddddd dwSignature dwStrucVersion dwFileVersionMs dwFileVersionLs dwProductVersionMs dwProductVersionLs dwFileFlagsMask dwFileFlags dwFileOs dwFileType dwFileSubtype dwFileDateMs dwFileDateLs"
 EOF
 RUN
-
-NAME=mdmp 32bit - libraries count
-FILE=bins/mdmp/hello.dmp
-CMDS=il:quiet~?
-EXPECT=<<EOF
-57
-EOF
-RUN
-
-NAME=mdmp 32bit - libraries resolving
-FILE=bins/mdmp/hello.dmp
-CMDS=il~kernel32.dll
-EXPECT=<<EOF
-[0x00400000] - kernel32.dll
-EOF
-RUN
-
-NAME=mdmp 32bit - entrypoints count
-FILE=bins/mdmp/hello.dmp
-CMDS=<<EOF
-ie:quiet~?
-iee:quiet~?
-EOF
-EXPECT=<<EOF
-11
-2
-EOF
-RUN
-
-NAME=mdmp 32bit - entrypoints resolving
-FILE=bins/mdmp/hello.dmp
-CMDS=ie~0x004014e0
-EXPECT=<<EOF
-0x004014e0 0x000990b2 ---------- 0x00097c7a program
-EOF
-RUN
-
-NAME=mdmp 32bit - symbols count
-FILE=bins/mdmp/hello.dmp
-CMDS=is~?
-EXPECT=<<EOF
-7468
-EOF
-RUN
-
-NAME=mdmp 32bit - symbols resolving 1
-FILE=bins/mdmp/hello.dmp
-CMDS=is~DeleteCriticalSection:0
-EXPECT=<<EOF
-   1 0x0009dcda 0x00406108 NONE   FUNC    0 KERNEL32.dll                                  imp.DeleteCriticalSection
-EOF
-RUN
-
-NAME=mdmp 32bit - symbols resolving 2
-FILE=bins/mdmp/hello.dmp
-CMDS=is~RtlDeleteCriticalSection:0
-EXPECT=<<EOF
- 358 0x001c2176 0x76fb05a4 NONE   FUNC    0 ntdll.dll                                     imp.RtlDeleteCriticalSection
-EOF
-RUN
-
-NAME=mdmp 32bit - imports count
-FILE=bins/mdmp/hello.dmp
-CMDS=ii~?
-EXPECT=<<EOF
-2030
-EOF
-RUN
-
-NAME=mdmp 32bit - imports resolving
-FILE=bins/mdmp/hello.dmp
-CMDS=ii~TerminateProcess~KERNEL32.dll
-EXPECT=<<EOF
- 17 0x00406148 NONE FUNC KERNEL32.dll                                  TerminateProcess
-EOF
-RUN
-
-NAME=mdmp 32bit - exports count
-FILE=bins/mdmp/hello.dmp
-CMDS=iE~?
-EXPECT=<<EOF
-5440
-EOF
-RUN
-
-NAME=mdmp 32bit - exports resolving
-FILE=bins/mdmp/hello.dmp
-CMDS=iE~Ordinal_1
-EXPECT=<<EOF
-   1 0x0041f1f2 0x77802620 GLOBAL FUNC    0 ntdll.dll      Ordinal_1
-EOF
-RUN
-
-NAME=mdmp 32bit - strings
-FILE=bins/mdmp/hello.dmp
-CMDS=<<EOF
-iz~0x0043cf24[1,2,3,4,5,6,7,8]
-iz~0x0043cf2e[1,2,3,4,5,6,7,8]
-iz~0x0043cf38[1,2,3,4,5,6,7,8]
-iz~0x00447247[1,2,3,4,5,6,7,8]
-iz~0x0044726b[1,2,3,4,5,6,7,8]
-iz~0x00447291[1,2,3,4,5,6,7,8]
-iz~0x004472ac[1,2,3,4,5,6,7,8]
-iz~0x0048acc8[1,2,3,4,5,6,7,8]
-iz~0x0048b004[1,2,3,4,5,6,7,8]
-iz~0x00168c38[1,2,3,4,5,6,7,8]
-iz~0x00168f80[1,2,3,4,5,6,7,8]
-iz~0x00128c38[1,2,3,4,5,6,7,8]
-iz~0x00128fa8[1,2,3,4,5,6,7,8]
-iz~0x000cdc38[1,2,3,4,5,6,7,8]
-iz~0x000cdf84[1,2,3,4,5,6,7,8]
-iz~0x00299106[1,2,3,4,5,6,7,8]
-iz~0x001adff0[1,2,3,4,5,6,7,8]
-iz~0x0033641a[1,2,3,4,5,6,7,8]
-iz~0x00337f88[1,2,3,4,5,6,7,8]
-EOF
-EXPECT=<<EOF
-0x77820352 4 10 C:_Windows_System32__tdll.dll utf16le Alpc
-0x7782035c 4 10 C:_Windows_System32__tdll.dll utf16le Pool
-0x77820366 5 12 C:_Windows_System32__tdll.dll utf16le Timer
-0x7782a675 35 36 C:_Windows_System32__tdll.dll ascii RtlFindActivationContextSectionGuid
-0x7782a699 37 38 C:_Windows_System32__tdll.dll ascii RtlFindActivationContextSectionString
-0x7782a6bf 26 27 C:_Windows_System32__tdll.dll ascii RtlFindCharInUnicodeString
-0x7782a6da 16 17 C:_Windows_System32__tdll.dll ascii RtlFindClearBits
-0x7786e0f6 15 32 C:_Windows_System32__tdll.dll utf16le VS_VERSION_INFO
-0x7786e432 11 24 C:_Windows_System32__tdll.dll utf16le VarFileInfo
-0x7500d066 15 32 C:_Windows_System32_wow64.dll utf16le VS_VERSION_INFO
-0x7500d3ae 11 24 C:_Windows_System32_wow64.dll utf16le VarFileInfo
-0x74fc9066 15 32 C:_Windows_System32_wow64win.dll utf16le VS_VERSION_INFO
-0x74fc93d6 11 24 C:_Windows_System32_wow64win.dll utf16le VarFileInfo
-0x74f66066 15 32 C:_Windows_System32_wow64cpu.dll utf16le VS_VERSION_INFO
-0x74f663b2 11 24 C:_Windows_System32_wow64cpu.dll utf16le VarFileInfo
-0x77378534 11 12 C:_Windows_SysWOW64_kernel32.dll ascii _vfprintf_l
-0x75d9341e 11 24 C:_Windows_SysWOW64_KERNELBASE.dll utf16le VarFileInfo
-0x77415848 39 40 C:_Windows_SysWOW64_msvcrt.dll ascii Assertion failed: %s
-0x774173b6 11 24 C:_Windows_SysWOW64_msvcrt.dll utf16le VarFileInfo
-EOF
-RUN
-
-NAME=mdmp 64bit - libraries count
-FILE=bins/mdmp/hello64.dmp
-CMDS=il:quiet~?
-EXPECT=<<EOF
-49
-EOF
-RUN
-
-NAME=mdmp 64bit - libraries resolving
-FILE=bins/mdmp/hello64.dmp
-CMDS=il~kernel32.dll
-EXPECT=<<EOF
-[0x00400000] - kernel32.dll
-EOF
-RUN
-
-NAME=mdmp 64bit - entrypoints count
-FILE=bins/mdmp/hello64.dmp
-CMDS=ie:quiet~?
-EXPECT=<<EOF
-5
-EOF
-RUN
-
-NAME=mdmp 64bit - entrypoints resolving
-FILE=bins/mdmp/hello64.dmp
-CMDS=ie~0x00401500
-EXPECT=<<EOF
-   0x00401500 0x0009418f ---------- 0x00092d37 program
-EOF
-RUN
-
-NAME=mdmp 64bit - symbols count
-FILE=bins/mdmp/hello64.dmp
-CMDS=is~?
-EXPECT=<<EOF
-6826
-EOF
-RUN
-
-NAME=mdmp 64bit - symbols resolving 1
-FILE=bins/mdmp/hello64.dmp
-CMDS=is~imp.DeleteCriticalSection~KERNEL32.dll
-EXPECT=<<EOF
-   1 0x0009ae8b    0x004081fc NONE   FUNC    0 KERNEL32.dll                                  imp.DeleteCriticalSection
-EOF
-RUN
-
-NAME=mdmp 64bit - symbols resolving 2
-FILE=bins/mdmp/hello64.dmp
-CMDS=is~A_SHAFinal
-EXPECT=<<EOF
-   9 0x001eb87f    0x77728bf0 GLOBAL FUNC    0 ntdll.dll                                     A_SHAFinal
-EOF
-RUN
-
-NAME=mdmp 64bit - imports count
-FILE=bins/mdmp/hello64.dmp
-CMDS=ii~?
-EXPECT=<<EOF
-1511
-EOF
-RUN
-
-NAME=mdmp 64bit - imports resolving
-FILE=bins/mdmp/hello64.dmp
-CMDS=ii~KERNEL32.dll~GetCurrentProcessId
-EXPECT=<<EOF
-  4    0x00408214 NONE FUNC KERNEL32.dll                                  GetCurrentProcessId
-EOF
-RUN
-
-NAME=mdmp 64bit - exports count
-FILE=bins/mdmp/hello64.dmp
-CMDS=iE~?
-EXPECT=<<EOF
-5317
-EOF
-RUN
-
-NAME=mdmp 64bit - exports resolving
-FILE=bins/mdmp/hello64.dmp
-CMDS=iE~CsrVerifyRegion
-EXPECT=<<EOF
-  39 0x0029513f    0x777d24b0 GLOBAL FUNC    0 ntdll.dll      CsrVerifyRegion
-EOF
-RUN
-
-NAME=mdmp 64bit - strings
-FILE=bins/mdmp/hello64.dmp
-TIMEOUT=2040
-CMDS=<<EOF
-iz~0x002e2fe1[1,2,3,4,5,6,7,8]
-iz~0x002e2feb[1,2,3,4,5,6,7,8]
-iz~0x002e2ff5[1,2,3,4,5,6,7,8]
-iz~0x00330d85[1,2,3,4,5,6,7,8]
-iz~0x003310c1[1,2,3,4,5,6,7,8]
-iz~0x00161a37[1,2,3,4,5,6,7,8]
-iz~0x00161c7f[1,2,3,4,5,6,7,8]
-iz~0x00161dbf[1,2,3,4,5,6,7,8]
-iz~0x001d9d45[1,2,3,4,5,6,7,8]
-iz~0x001da0a5[1,2,3,4,5,6,7,8]
-iz~0x003fad45[1,2,3,4,5,6,7,8]
-iz~0x003fb0ad[1,2,3,4,5,6,7,8]
-iz~0x00480857[1,2,3,4,5,6,7,8]
-iz~0x004808c7[1,2,3,4,5,6,7,8]
-iz~0x00499cf5[1,2,3,4,5,6,7,8]
-iz~0x0049a045[1,2,3,4,5,6,7,8]
-EOF
-EXPECT=<<EOF
-0x77820352 4 10 C:_Windows_System32__tdll.dll utf16le Alpc
-0x7782035c 4 10 C:_Windows_System32__tdll.dll utf16le Pool
-0x77820366 5 12 C:_Windows_System32__tdll.dll utf16le Timer
-0x7786e0f6 15 32 C:_Windows_System32__tdll.dll utf16le VS_VERSION_INFO
-0x7786e432 11 24 C:_Windows_System32__tdll.dll utf16le VarFileInfo
-0x7759dda8 7 16 C:_Windows_System32_kernel32.dll utf16le win.ini
-0x7759dff0 20 42 C:_Windows_System32_kernel32.dll utf16le \Classes\Wow6432Node
-0x7759e130 45 92 C:_Windows_System32_kernel32.dll utf16le \REGISTRY\USER\*\SOFTWARE\Classes\Wow6432Node
-0x776160b6 15 32 C:_Windows_System32_kernel32.dll utf16le VS_VERSION_INFO
-0x77616416 11 24 C:_Windows_System32_kernel32.dll utf16le VarFileInfo
-0x7fefd5080b6 15 32 C:_Windows_System32_KERNELBASE.dll utf16le VS_VERSION_INFO
-0x7fefd50841e 11 24 C:_Windows_System32_KERNELBASE.dll utf16le VarFileInfo
-0x7fefdb33bc8 4 10 C:_Windows_System32_msvcrt.dll utf16le PATH
-0x7fefdb33c38 10 22 C:_Windows_System32_msvcrt.dll utf16le SystemRoot
-0x7fefdb4d066 15 32 C:_Windows_System32_msvcrt.dll utf16le VS_VERSION_INFO
-0x7fefdb4d3b6 11 24 C:_Windows_System32_msvcrt.dll utf16le VarFileInfo
-EOF
-RUN
-
-NAME=mdmp reload file
-FILE=bins/mdmp/calc.dmp
-CMDS=<<EOF
-obR
-echo ok
-EOF
-EXPECT=<<EOF
-ok
-EOF
-RUN
diff --git a/test/db/formats/mdt b/test/db/formats/mdt
index 1ef4430db5..362bc39c8e 100644
--- a/test/db/formats/mdt
+++ b/test/db/formats/mdt
@@ -1,7 +1,74 @@
-NAME=iH
+NAME=mdt analysis
 FILE=bins/mdt/bin-mdt/load-test.mdt
 CMDS=<<EOF
 iH
+echo ---
+oml
+echo ---
+echo "======== Sections ========"
+iS
+echo "======== Segments ========"
+iSS
+echo ---
+ie
+echo ---
+
+# This should give the same (relative) result as the reloc tests in db/analysis/hexagon.
+# The load-bin.b04 is the same binary as used for the reloc tests there.
+
+echo "==== Print relocs ===="
+ir
+echo ---
+
+# This should give the same (relative) result as the reloc tests in db/analysis/hexagon.
+# The load-bin.b04 is the same binary as used for the reloc tests there.
+
+e plugins.hexagon.imm.sign=false
+echo "==== Print instructions ===="
+s section.load_test.b04.text
+pi 30
+echo "==== Print patched bytes ===="
+s loc.r_hex_32
+px 16~[1-8]
+echo ---
+
+# The binaries in the image are test/bins/analysis/hexagon-hello-loop
+# and test/bins/elf/hexagon/relocs.
+
+# The numbers of symbols should always match the sum.
+# So it can be cross-checked.
+echo "==== symbols count hexagon-hello-loop + relocs. Expected 519 + 22 ===="
+isq~?
+echo ---
+
+# The binaries in the image are test/bins/analysis/hexagon-hello-loop
+# and test/bins/elf/hexagon/relocs.
+
+e plugins.hexagon.imm.sign=false
+echo "==== symbols vaddr correct hexagon-hello-loop ===="
+is~fputs
+is~.CONST_4197D78400000000
+echo "==== symbols vaddr correct relocs ===="
+is~test_sym
+is~r_hex_b15_pcrel
+echo ---
+
+# The binaries in the image are test/bins/analysis/hexagon-hello-loop
+# and test/bins/elf/hexagon/relocs.
+# Note that hexagon-hello-loop doesn't have relocations.
+
+e plugins.hexagon.imm.sign=false
+echo "==== hexagon-hello-loop ===="
+# One for each executable section.
+echo "== .init"
+pi 10 @ sym..init
+echo "== .text"
+pi 10 @ sym._Putfld
+echo "== .fini"
+pi 10 @ sym._fini
+echo "==== relocs ===="
+echo "== loc.r_hex_b7_pcrel_x"
+pi 10 @ loc.r_hex_b7_pcrel_x
 EOF
 EXPECT=<<EOF
 mdt_segments:
@@ -103,15 +170,7 @@ mdt_segments:
         e_shnum: 5
         e_shstrndx: 1
 
-EOF
-RUN
-
-NAME=oml
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-oml
-EOF
-EXPECT=<<EOF
+---
  1 fd: 4 +0x00000000 0x89201c18 - 0x89201fff --- mmap.load-test.b01
  2 fd: 5 +0x00000000 0x89200000 - 0x89201c17 --- vmap.load-test.b01
  3 fd: 6 +0x00000000 0xfe030000 - 0xfe0aefff r-x mmap.load-test.b02
@@ -126,18 +185,7 @@ EXPECT=<<EOF
 12 fd: 11 +0x0000022c 0xc00c922c - 0xc00c9387 --x vmap.load-test.b04..rela.text
 13 fd: 11 +0x000000bc 0xc00c90bc - 0xc00c922b --- vmap.load-test.b04..symtab
 14 fd: 11 +0x00000000 0xc00c9000 - 0xc00c9033 r-- vmap.load-test.b04.ehdr
-EOF
-RUN
-
-NAME=iSS - segments
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-echo "======== Sections ========"
-iS
-echo "======== Segments ========"
-iSS
-EOF
-EXPECT=<<EOF
+---
 ======== Sections ========
      paddr   size      vaddr  vsize align perm name                    type flags 
 ----------------------------------------------------------------------------------
@@ -175,32 +223,11 @@ EXPECT=<<EOF
 0x874af000 0x12160 0x00550000 0x1a000   0x1000 -r-x load-test.b03
 0x00000000    0x34 0xc00c9000    0x34      0x0 -rw- load-test.b04.ehdr
 0x874c9000   0x5b4 0xc00c9000  0x1000   0x1000 -r-x load-test.b04
-EOF
-RUN
-
-NAME=ie - entries
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-ie
-EOF
-EXPECT=<<EOF
+---
      vaddr      paddr     hvaddr      haddr type 
 -------------------------------------------------
 0xfe000000 0x00000000 ---------- ---------- init
-EOF
-RUN
-
-NAME=ir - relocs print
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-
-# This should give the same (relative) result as the reloc tests in db/analysis/hexagon.
-# The load-bin.b04 is the same binary as used for the reloc tests there.
-
-echo "==== Print relocs ===="
-ir
-EOF
-EXPECT=<<EOF
+---
 ==== Print relocs ====
      vaddr      paddr     target type                name                  
 ---------------------------------------------------------------------------
@@ -233,26 +260,7 @@ EXPECT=<<EOF
 0xc00c90b0 0x000000b0 0xc00c9034 R_HEX_16            test_sym
 0xc00c90b4 0x000000b4 0xc00c9034 R_HEX_8             test_sym
 0xc00c90b8 0x000000b8 0xc00c9034 R_HEX_32_PCREL      test_sym - 0xc00c90b8
-EOF
-RUN
-
-
-NAME=ir - relocs patching
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-
-# This should give the same (relative) result as the reloc tests in db/analysis/hexagon.
-# The load-bin.b04 is the same binary as used for the reloc tests there.
-
-e plugins.hexagon.imm.sign=false
-echo "==== Print instructions ===="
-s section.load_test.b04.text
-pi 30
-echo "==== Print patched bytes ===="
-s loc.r_hex_32
-px 16~[1-8]
-EOF
-EXPECT=<<EOF
+---
 ==== Print instructions ====
 [   nop
 [   nop
@@ -287,43 +295,10 @@ EXPECT=<<EOF
 ==== Print patched bytes ====
 offset - 0 1 2 3 4 5
 3490 0cc0 3490 0000 3400 0000 7cff ffff
-EOF
-RUN
-
-NAME=is - symbols count
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-
-# The binaries in the image are test/bins/analysis/hexagon-hello-loop
-# and test/bins/elf/hexagon/relocs.
-
-# The numbers of symbols should always match the sum.
-# So it can be cross-checked.
-echo "==== symbols count hexagon-hello-loop + relocs. Expected 519 + 22 ===="
-isq~?
-EOF
-EXPECT=<<EOF
+---
 ==== symbols count hexagon-hello-loop + relocs. Expected 519 + 22 ====
 541
-EOF
-RUN
-
-NAME=is - symbols vaddr
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-
-# The binaries in the image are test/bins/analysis/hexagon-hello-loop
-# and test/bins/elf/hexagon/relocs.
-
-e plugins.hexagon.imm.sign=false
-echo "==== symbols vaddr correct hexagon-hello-loop ===="
-is~fputs
-is~.CONST_4197D78400000000
-echo "==== symbols vaddr correct relocs ===="
-is~test_sym
-is~r_hex_b15_pcrel
-EOF
-EXPECT=<<EOF
+---
 ==== symbols vaddr correct hexagon-hello-loop ====
 425 0x0000a2d0 0x005592d0 GLOBAL FUNC    244     fputs
  61 0x00001000 0x00550000 LOCAL  FILE      0     fputs.c
@@ -332,31 +307,7 @@ EXPECT=<<EOF
  22 0x00000034 0xc00c9034 GLOBAL NOTYPE    0     test_sym
   9 0x00000078 0xc00c9078 LOCAL  NOTYPE    0     r_hex_b15_pcrel_x
   8 0x00000048 0xc00c9048 LOCAL  NOTYPE    0     r_hex_b15_pcrel
-EOF
-RUN
-
-NAME=is - symbols assembly
-FILE=bins/mdt/bin-mdt/load-test.mdt
-CMDS=<<EOF
-
-# The binaries in the image are test/bins/analysis/hexagon-hello-loop
-# and test/bins/elf/hexagon/relocs.
-# Note that hexagon-hello-loop doesn't have relocations.
-
-e plugins.hexagon.imm.sign=false
-echo "==== hexagon-hello-loop ===="
-# One for each executable section.
-echo "== .init"
-pi 10 @ sym..init
-echo "== .text"
-pi 10 @ sym._Putfld
-echo "== .fini"
-pi 10 @ sym._fini
-echo "==== relocs ===="
-echo "== loc.r_hex_b7_pcrel_x"
-pi 10 @ loc.r_hex_b7_pcrel_x
-EOF
-EXPECT=<<EOF
+---
 ==== hexagon-hello-loop ====
 == .init
 [   allocframe(SP,#0x8):raw
diff --git a/test/db/formats/menuet b/test/db/formats/menuet
index a3168e638c..927f9cc903 100644
--- a/test/db/formats/menuet
+++ b/test/db/formats/menuet
@@ -2,10 +2,12 @@ NAME=Menuet: Open/iI/iH
 FILE=bins/menuet/dosbox
 CMDS=<<EOF
 iI~?MenuetOS
+echo ---
 iH
 EOF
 EXPECT=<<EOF
 1
+---
 menuet:
   magic: "4d 45 4e 55 45 54 30 31                         |MENUET01        |"
   version: 1
@@ -19,13 +21,3 @@ menuet:
 
 EOF
 RUN
-
-NAME=Menuet: maps
-FILE=bins/menuet/dosbox
-CMDS=oml
-EXPECT=<<EOF
- 1 fd: 3 +0x00000024 0x00000024 * 0x0011b023 r-x fmap.text
- 2 fd: 4 +0x00000000 0xffb8000c - 0xffb80817 r-- mmap.idata
- 3 fd: 3 +0x0dfde800 0x0dfde800 - 0xffb8000b r-- fmap.idata
-EOF
-RUN
diff --git a/test/db/formats/n3ds b/test/db/formats/n3ds
index 1d9b2fa95a..1d83738eda 100644
--- a/test/db/formats/n3ds
+++ b/test/db/formats/n3ds
@@ -1,6 +1,14 @@
-NAME=Load Nintendo 3DS boot.firm file
+NAME=Nintendo 3DS analysis
 FILE=bins/firmware/luma3ds_boot.firm
-CMDS=iI ; iS ; ie ; iT
+CMDS=<<EOF
+iI
+echo ---
+iS
+echo ---
+ie
+echo ---
+iT
+EOF
 EXPECT=<<EOF
 arch     arm
 cpu      N/A
@@ -36,16 +44,19 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
      paddr    size      vaddr   vsize align perm name             type                    flags 
 ------------------------------------------------------------------------------------------------
 0x00000200 0x17c00 0x18180000 0x17c00   0x0 -rwx sysmodule.arm11  Arm11 SysModule         xdma
 0x00017e00   0x600 0x1ff80000   0x600   0x0 -rwx entry.arm11      Arm11 Kernel            xdma
 0x00018400  0xfa00 0x08006000  0xfa00   0x0 -rwx entry.arm9       Arm9 Kernel             ndma
 0x00027e00  0x5a00 0x18000000  0x5a00   0x0 -rwx extensions.arm11 Arm11 Kernel Extensions xdma
+---
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x08006000 0x00018400 ---------- ---------- program
 0x1ff80000 0x00017e00 ---------- ---------- program
+---
 md5 f7c0d04ab092e3707a4020154f49b4d5
 sha1 67dde28ca87305199542ace0b1b5632e585cd92c
 sha256 21a50466c73aa2bf255a167424586aed456e970e3ac69ebb0a930abd9075b31b
diff --git a/test/db/formats/ne b/test/db/formats/ne
index 7df73427ca..95f81c63f0 100644
--- a/test/db/formats/ne
+++ b/test/db/formats/ne
@@ -1,4 +1,4 @@
-NAME=NE Symbols
+NAME=NE anim8 analysis
 FILE=bins/ne/anim8.exe
 CMDS=<<EOF
 ia
diff --git a/test/db/formats/nes b/test/db/formats/nes
index f254d267c5..baa556cafc 100644
--- a/test/db/formats/nes
+++ b/test/db/formats/nes
@@ -1,4 +1,4 @@
-NAME=NES: Pong - open
+NAME=NES: Pong analysis
 FILE=bins/nes/Pong.nes
 ARGS=-A
 CMDS=q!
diff --git a/test/db/formats/ninds b/test/db/formats/ninds
index 2797ab3aea..2de4d7ab04 100644
--- a/test/db/formats/ninds
+++ b/test/db/formats/ninds
@@ -1,6 +1,14 @@
 NAME=Nintendo DS
 FILE=bins/nds/bin
-CMDS=iI ; omlt ; iS ; ie
+CMDS=<<EOF
+iI
+echo ---
+omlt 
+echo ---
+iS
+echo ---
+ie
+EOF
 EXPECT=<<EOF
 arch     arm
 cpu      N/A
@@ -36,16 +44,19 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
 .-------------------------------------------------------------------------------------.
 | id | fd |       pa |   pa_end |     size |        va |    va_end | perm | name      |
 )-------------------------------------------------------------------------------------(
 |  1 |  3 |    0x200 | 0x1b0a64 | 0x1b0864 | 0x2000000 | 0x21b0864 | r-x  | fmap.arm9 |
 |  2 |  3 | 0x1b0c00 | 0x1be750 |   0xdb50 | 0x37f8000 | 0x3805b50 | r-x  | fmap.arm7 |
 `-------------------------------------------------------------------------------------'
+---
      paddr     size      vaddr    vsize align perm name type flags 
 -------------------------------------------------------------------
 0x00000200 0x1b0864 0x02000000 0x1b0864   0x0 -rwx arm9      
 0x001b0c00   0xdb50 0x037f8000   0xdb50   0x0 -rwx arm7      
+---
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x02000000 0x00000200 ---------- ---------- program
diff --git a/test/db/formats/nro b/test/db/formats/nro
index 11de8e80a7..d37f75df2e 100644
--- a/test/db/formats/nro
+++ b/test/db/formats/nro
@@ -1,15 +1,19 @@
 NAME=nro detection
 FILE=bins/nro/appstore.nro
-CMDS=iI~?switch
+CMDS=<<EOF
+iI~?switch
+echo ---
+iS
+echo ---
+oml
+echo ---
+ie
+echo ---
+p8 0x30 @ 0x80
+EOF
 EXPECT=<<EOF
 2
-EOF
-RUN
-
-NAME=nro sections
-FILE=bins/nro/appstore.nro
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr     size      vaddr    vsize align perm name   type flags 
 ---------------------------------------------------------------------
 0x00000000     0x80 0x00000000     0x80   0x0 -r-- header      
@@ -17,33 +21,15 @@ EXPECT=<<EOF
 0x00000000 0x1b4000 0x00000000 0x1b4000   0x0 -r-x text        
 0x001b4000  0x5a000 0x001b4000  0x5a000   0x0 -r-- ro          
 0x0020e000   0xf000 0x0020e000   0xf000   0x0 -rw- data        
-EOF
-RUN
-
-NAME=nro maps
-FILE=bins/nro/appstore.nro
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 3 +0x00000000 0x00000000 * 0x001b3fff r-x fmap.text
  2 fd: 3 +0x001b4000 0x001b4000 - 0x0020dfff r-- fmap.ro
  3 fd: 3 +0x0020e000 0x0020e000 - 0x0021cfff r-- fmap.data
-EOF
-RUN
-
-NAME=nro entry
-FILE=bins/nro/appstore.nro
-CMDS=ie
-EXPECT=<<EOF
+---
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x00000080 0x00000080 ---------- ---------- program
-EOF
-RUN
-
-NAME=nro data
-FILE=bins/nro/appstore.nro
-CMDS=p8 0x30 @ 0x80
-EXPECT=<<EOF
+---
 fb031eaa01000094dc2302d1f90300aafa0301aae0100090c11100d00000199121e02191210000cb211c009121f07d92
 EOF
 RUN
diff --git a/test/db/formats/nso b/test/db/formats/nso
index 4249d536b9..ad0829991d 100644
--- a/test/db/formats/nso
+++ b/test/db/formats/nso
@@ -1,47 +1,14 @@
-NAME=nso detection
-FILE=bins/nso/application.nso
-CMDS=iI~?switch
-EXPECT=<<EOF
-2
-EOF
-RUN
-
-NAME=nso sections
-FILE=bins/nso/application.nso
-CMDS=iS
-EXPECT=<<EOF
-     paddr    size      vaddr   vsize align perm name   type flags 
--------------------------------------------------------------------
-0x00000000   0x100 0x00000000   0x100   0x0 -r-- header      
-0x00000000 0x20e18 0x08000000 0x20e18   0x0 -r-x text        
-0x00020e18  0xdb0c 0x08021000  0xdb0c   0x0 -r-- ro          
-0x0002e924  0x4218 0x0802f000  0x4218   0x0 -rw- data        
-EOF
-RUN
-
-NAME=nso maps
-FILE=bins/nso/application.nso
-CMDS=oml
-EXPECT=<<EOF
- 1 fd: 4 +0x00000000 0x08000000 * 0x08020e17 r-x vmap.text
- 2 fd: 4 +0x00020e18 0x08021000 - 0x0802eb0b r-- vmap.ro
- 3 fd: 4 +0x0002e924 0x0802f000 - 0x08033217 r-- vmap.data
-EOF
-RUN
-
-NAME=nso entry
-FILE=bins/nso/application.nso
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x08000000 0x00000100 ---------- ---------- program
-EOF
-RUN
-
-NAME=nso data
+NAME=nso analysis
 FILE=bins/nso/application.nso
 CMDS=<<EOF
+iI~?switch
+echo ---
+iS
+echo ---
+oml
+echo ---
+ie
+echo ---
 echo text
 p8 0x30 @ 0x08000080
 echo ro
@@ -51,6 +18,23 @@ p8 0x30 @ 0x0802f000
 p8 0x30 @ 0x0802f350
 EOF
 EXPECT=<<EOF
+2
+---
+     paddr    size      vaddr   vsize align perm name   type flags 
+-------------------------------------------------------------------
+0x00000000   0x100 0x00000000   0x100   0x0 -r-- header      
+0x00000000 0x20e18 0x08000000 0x20e18   0x0 -r-x text        
+0x00020e18  0xdb0c 0x08021000  0xdb0c   0x0 -r-- ro          
+0x0002e924  0x4218 0x0802f000  0x4218   0x0 -rw- data        
+---
+ 1 fd: 4 +0x00000000 0x08000000 * 0x08020e17 r-x vmap.text
+ 2 fd: 4 +0x00020e18 0x08021000 - 0x0802eb0b r-- vmap.ro
+ 3 fd: 4 +0x0002e924 0x0802f000 - 0x08033217 r-- vmap.data
+---
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x08000000 0x00000100 ---------- ---------- program
+---
 text
 e7031eaa01000094c62302d1e50300aae40301aabf0000f1841841ba400000544a240014fb0307aaf90305aafa0304aa
 ro
diff --git a/test/db/formats/omf b/test/db/formats/omf
index 7e103c4079..c5756cbe76 100644
--- a/test/db/formats/omf
+++ b/test/db/formats/omf
@@ -2,11 +2,17 @@ NAME=16 bits omf
 FILE=bins/omf/hello_world
 CMDS=<<EOF
 iI~bits
+echo ---
 iH
+echo ---
 ie:quiet
+echo ---
 is
+echo ---
 iS
+echo ---
 oml
+echo ---
 px 16 @ section.text_1
 px 16 @ section.data_1
 e asm.bytes=true
@@ -14,6 +20,7 @@ pdq 1~mov[1]
 EOF
 EXPECT=<<EOF
 bits     16
+---
 omf:
   bits: 16
   num_names: 3
@@ -49,16 +56,21 @@ omf:
       paddr: 0x73
       vaddr: 0x1000
 
+---
 0x00001000 0x00000073 ---------- ---------- program
+---
 nth      paddr      vaddr bind type size lib name   
 ----------------------------------------------------
   1 0x00000073 0x00001000 NONE NONE    0     _start
+---
      paddr size      vaddr vsize align perm name   type flags 
 --------------------------------------------------------------
 0x00000073 0x13 0x00001000  0x13   0x0 -rwx text_1      
 0x00000095  0xe 0x00001013   0xe   0x0 -rwx data_1      
+---
  1 fd: 3 +0x00000073 0x00001000 * 0x00001012 r-x fmap.text_1
  2 fd: 3 +0x00000095 0x00001013 - 0x00001020 r-x fmap.data_1
+---
 - offset -  0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
 0000:1000  ba0e 00b9 0000 bb01 00b8 0400 cd80 b801  ................
 - offset -  0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
diff --git a/test/db/formats/pdb b/test/db/formats/pdb
index 6525655d95..ad36331860 100644
--- a/test/db/formats/pdb
+++ b/test/db/formats/pdb
@@ -272,11 +272,53 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=find structure R2_TEST_STRUCT
+NAME=PDB Project1 structs unions and enums
 FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao R2_TEST_STRUCT
+CMDS=<<EOF
+!rz-bin -P ${RZ_FILE} | grep -ao R2_TEST_STRUCT
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -ao R2_TEST_UNION
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -ao R2_TEST_ENUM
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -ao r2_struct_var_1
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -ao r2_struct_var_2
+echo ---
+!rz-bin -P ${RZ_FILE} | grep r2_struct_var_1 | grep -ao int32_t
+echo ---
+!rz-bin -P ${RZ_FILE} | grep r2_struct_var_2 | grep -ao int16_t
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -ao r2_union_var_1
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -ao r2_union_var_2
+echo ---
+!rz-bin -P ${RZ_FILE} | grep r2_union_var_1 | grep -ao int32_t
+echo ---
+!rz-bin -P ${RZ_FILE} | grep r2_union_var_2 | grep -ao double
+EOF
 EXPECT=<<EOF
 R2_TEST_STRUCT
+---
+R2_TEST_UNION
+---
+R2_TEST_ENUM
+---
+r2_struct_var_1
+---
+r2_struct_var_2
+---
+int32_t
+---
+int16_t
+---
+r2_union_var_1
+---
+r2_union_var_2
+---
+int32_t
+---
+double
 EOF
 RUN
 
@@ -297,22 +339,6 @@ _onexit_table_t
 EOF
 RUN
 
-NAME=find union R2_TEST_UNION
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao R2_TEST_UNION
-EXPECT=<<EOF
-R2_TEST_UNION
-EOF
-RUN
-
-NAME=find enum R2_TEST_ENUM
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao R2_TEST_ENUM
-EXPECT=<<EOF
-R2_TEST_ENUM
-EOF
-RUN
-
 NAME=find enum _RTC_ErrorNumber
 FILE=bins/pdb/vs2019_cpp_override.pdb
 CMDS=!rz-bin -P ${RZ_FILE} | grep -ao _RTC_ErrorNumber
@@ -329,14 +355,6 @@ _RTC_ILLEGAL
 EOF
 RUN
 
-NAME=member1 name of structure R2_TEST_STRUCT
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao r2_struct_var_1
-EXPECT=<<EOF
-r2_struct_var_1
-EOF
-RUN
-
 NAME=member1 of structure _onexit_table_t # LF_STRUCTURE_19
 FILE=bins/pdb/vs2019_cpp_override.pdb
 CMDS=!rz-bin -P ${RZ_FILE} | grep -ao "void\ (\*\*_first)();"
@@ -345,62 +363,6 @@ void (**_first)();
 EOF
 RUN
 
-NAME=member2 name of structure R2_TEST_STRUCT
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao r2_struct_var_2
-EXPECT=<<EOF
-r2_struct_var_2
-EOF
-RUN
-
-NAME=member1 type of structure R2_TEST_STRUCT
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep r2_struct_var_1 | grep -ao int32_t
-EXPECT=<<EOF
-int32_t
-EOF
-RUN
-
-NAME=member2 type of structure R2_TEST_STRUCT
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep r2_struct_var_2 | grep -ao int16_t
-EXPECT=<<EOF
-int16_t
-EOF
-RUN
-
-NAME=member1 name of union R2_TEST_UNION
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao r2_union_var_1
-EXPECT=<<EOF
-r2_union_var_1
-EOF
-RUN
-
-NAME=member2 name of union R2_TEST_UNION
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -ao r2_union_var_2
-EXPECT=<<EOF
-r2_union_var_2
-EOF
-RUN
-
-NAME=member1 type of union R2_TEST_UNION
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep r2_union_var_1 | grep -ao int32_t
-EXPECT=<<EOF
-int32_t
-EOF
-RUN
-
-NAME=member2 type of union R2_TEST_UNION
-FILE=bins/pdb/Project1.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep r2_union_var_2 | grep -ao double
-EXPECT=<<EOF
-double
-EOF
-RUN
-
 NAME=GUID CHECK
 FILE=bins/pdb/user32.dll
 CMDS=!rz-bin -I ${RZ_FILE} | grep -ao 15F778B3671D4EFDBDCDE79905308B792
@@ -420,50 +382,32 @@ __enc$textbss$end
 EOF
 RUN
 
-NAME=member1 type of struct _CONSOLE_READCONSOLE_CONTROL of arm PDB
+NAME=arm PDB structs enums and symbols
 FILE=bins/pe/hello_world_arm/hello_world_arm_ZiZoO2.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -C2 _CONSOLE_READCONSOLE_CONTROL | grep nLength | grep -ao uint32_t
+CMDS=<<EOF
+!rz-bin -P ${RZ_FILE} | grep -C2 _CONSOLE_READCONSOLE_CONTROL | grep nLength | grep -ao uint32_t
+echo ---
+!rz-bin -P ${RZ_FILE} | grep -C2 _CONSOLE_READCONSOLE_CONTROL | grep -ao nLength
+echo ---
+!rz-bin -P ${RZ_FILE} | grep all_control_bits | grep -ao 0x3c09f00
+echo ---
+!rz-bin -P ${RZ_FILE} | grep "__acrt_fenv_abstract_status {"
+echo ---
+!rz-bin -P ${RZ_FILE} | grep "_towlower_internal"
+echo ---
+!rz-bin -P ${RZ_FILE} | grep "south africa"
+EOF
 EXPECT=<<EOF
 uint32_t
-EOF
-RUN
-
-NAME=member1 name of struct _CONSOLE_READCONSOLE_CONTROL of arm PDB
-FILE=bins/pe/hello_world_arm/hello_world_arm_ZiZoO2.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep -C2 _CONSOLE_READCONSOLE_CONTROL | grep -ao nLength
-EXPECT=<<EOF
+---
 nLength
-EOF
-RUN
-
-NAME=member value of enum __acrt_fenv_machine_arm_control of arm PDB
-FILE=bins/pe/hello_world_arm/hello_world_arm_ZiZoO2.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep all_control_bits | grep -ao 0x3c09f00
-EXPECT=<<EOF
+---
 0x3c09f00
-EOF
-RUN
-
-NAME=enum __acrt_fenv_abstract_status of arm PDB
-FILE=bins/pe/hello_world_arm/hello_world_arm_ZiZoO2.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep "__acrt_fenv_abstract_status {"
-EXPECT=<<EOF
+---
 enum __acrt_fenv_abstract_status {
-EOF
-RUN
-
-NAME=symbol _towlower_internal of arm PDB
-FILE=bins/pe/hello_world_arm/hello_world_arm_ZiZoO2.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep "_towlower_internal"
-EXPECT=<<EOF
+---
 0x00066da4  4366  .text  _towlower_internal
-EOF
-RUN
-
-NAME=complex symbol of arm PDB
-FILE=bins/pe/hello_world_arm/hello_world_arm_ZiZoO2.pdb
-CMDS=!rz-bin -P ${RZ_FILE} | grep "south africa"
-EXPECT=<<EOF
+---
 0x000820c4  4366  .rdata  `string'::1484532236::"south africa"
 EOF
 RUN
diff --git a/test/db/formats/plan9 b/test/db/formats/plan9
index f53753c313..729c97ffb6 100644
--- a/test/db/formats/plan9
+++ b/test/db/formats/plan9
@@ -1,26 +1,20 @@
-NAME=Plan9: Open/iI
+NAME=Plan9: analysis
 FILE=bins/plan9/bin
-CMDS=iI~?plan9
+CMDS=<<EOF
+iI~?plan9
+echo ---
+oml
+echo ---
+iS
+EOF
 EXPECT=<<EOF
 2
-EOF
-RUN
-
-NAME=Plan9: maps
-FILE=bins/plan9/bin
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 4 +0x00000000 0x364a0721 - 0x364a0e21 r-x mmap.text
  2 fd: 3 +0x00000020 0x00000020 * 0x364a0720 r-x fmap.text
  3 fd: 5 +0x00000000 0x76d40c21 - 0x76d41120 rw- mmap.data
  4 fd: 3 +0x364a0721 0x364a0721 - 0x76d40c20 r-- fmap.data
-EOF
-RUN
-
-NAME=Plan9: sections
-FILE=bins/plan9/bin
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr       size      vaddr      vsize align perm name type flags 
 -----------------------------------------------------------------------
 0x00000020 0x364a0701 0x00000020 0x364a0e02   0x0 -r-x text      
diff --git a/test/db/formats/prg b/test/db/formats/prg
index 5a78d5ee12..1d95aaa601 100644
--- a/test/db/formats/prg
+++ b/test/db/formats/prg
@@ -3,6 +3,7 @@ FILE=bins/prg/t01.prg
 ARGS=-F prg
 CMDS=<<EOF
 iI
+echo ---
 p8 0x30 @ 0x0801
 EOF
 EXPECT=<<EOF
@@ -40,6 +41,7 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
 0c08e2079e2032303632000000a941a2ff9dff03cad0faad2408a2ff9dffd7cad0fa6005ffffffffffffffffffffffff
 EOF
 RUN
diff --git a/test/db/formats/psx b/test/db/formats/psx
index 05d5b73ac2..dd1a8fdd7e 100644
--- a/test/db/formats/psx
+++ b/test/db/formats/psx
@@ -1,25 +1,19 @@
-NAME=psx: sqrxz4 - iI
+NAME=psx: sqrxz4 analysis
 FILE=bins/psx/HITPSX.EXE
-CMDS=iI~?psx
+CMDS=<<EOF
+iI~?psx
+echo ---
+iS
+echo ---
+oml
+EOF
 EXPECT=<<EOF
 1
-EOF
-RUN
-
-NAME=psx: sqrxz4 - sections
-FILE=bins/psx/HITPSX.EXE
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr     size      vaddr    vsize align perm name type flags 
 -------------------------------------------------------------------
 0x00000800 0x180000 0x80010000 0x180000   0x0 -r-x TEXT      
-EOF
-RUN
-
-NAME=psx: sqrxz4 - maps
-FILE=bins/psx/HITPSX.EXE
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 3 +0x00000800 0x80010000 * 0x8018ffff r-x fmap.TEXT
 EOF
 RUN
diff --git a/test/db/formats/qnx b/test/db/formats/qnx
index c0516faaca..29ed485481 100644
--- a/test/db/formats/qnx
+++ b/test/db/formats/qnx
@@ -1,61 +1,39 @@
-NAME=load qnx
+NAME=qnx analysis
 FILE=bins/qnx/test.x
-CMDS=iI~bintype
+CMDS=<<EOF
+iI~bintype
+echo ---
+ie:quiet
+echo ---
+iS
+echo ---
+oml
+echo ---
+px 16 @ 0x00000152
+echo ---
+iC
+echo ---
+iH
+EOF
 EXPECT=<<EOF
 bintype  QNX
-EOF
-RUN
-
-NAME=entry point of qnx
-FILE=bins/qnx/test.x
-CMDS=ie:quiet
-EXPECT=<<EOF
+---
 0x0000021c 0x0000021c ---------- ---------- program
-EOF
-RUN
-
-NAME=sections of qnx
-FILE=bins/qnx/test.x
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr  size      vaddr vsize align perm name           type flags 
 -----------------------------------------------------------------------
 0x00000044  0xf6 0x00000044  0xf6   0x0 ---- LMF_LOAD            
 0x00000152 0x6c3 0x00000152 0x6c3   0x0 ---- LMF_LOAD_0x152      
-EOF
-RUN
-
-NAME=maps of qnx
-FILE=bins/qnx/test.x
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 3 +0x00000044 0x00000044 - 0x00000139 --- fmap.LMF_LOAD
  2 fd: 3 +0x00000152 0x00000152 - 0x00000814 --- fmap.LMF_LOAD
  3 fd: 3 +0x00000000 0x00000000 * 0x00001481 r-x 
-EOF
-RUN
-
-NAME=sections 16 bits content
-FILE=bins/qnx/test.x
-CMDS=px 16 @ 0x00000152
-EXPECT=<<EOF
+---
 - offset -   0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
 0x00000152  0000 0000 0000 cd00 9090 9090 0000 0000  ................
-EOF
-RUN
-
-NAME=get signature info
-FILE=bins/qnx/test.x
-CMDS=iC
-EXPECT=<<EOF
+---
 2692336605
-EOF
-RUN
-
-NAME=get header info
-FILE=bins/qnx/test.x
-CMDS=iH
-EXPECT=<<EOF
+---
 qnx_lmf:
   version: 400
   cflags: 0x16
diff --git a/test/db/formats/sfc b/test/db/formats/sfc
index 8afcc228e0..b4b4600667 100644
--- a/test/db/formats/sfc
+++ b/test/db/formats/sfc
@@ -2,9 +2,13 @@ NAME=snes speed_test_v51
 FILE=bins/snes/speed_test_v51.sfc
 CMDS=<<EOF
 iI
+echo ---
 iH
+echo ---
 im
+echo ---
 iS
+echo ---
 is
 EOF
 EXPECT=<<EOF
@@ -42,6 +46,7 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
 snes_rom:
   game_title: "SA-1 Support Test    "
   speed: "slow"
@@ -72,6 +77,7 @@ snes_rom:
       reset: 0x8000
       irq: 0x8347
 
+---
 name         size    address flags mirror    
 ---------------------------------------------
 SRAM_70   0x10000 0x00700000 rwx   
@@ -598,12 +604,14 @@ ROM_fc     0x8000 0x00fc8000 rwx
 ROM_7c     0x8000 0x007c8000 rwx   ROM_fc
 ROM_fd     0x8000 0x00fd8000 rwx   
 ROM_7d     0x8000 0x007d8000 rwx   ROM_fd
+---
      paddr   size      vaddr  vsize align perm name      type flags 
 --------------------------------------------------------------------
 0x00000000 0x8000 0x00808000 0x8000   0x0 -r-x rom_80         
 0x00008000 0x8000 0x00818000 0x8000   0x0 -r-x rom_81         
 0x00000000 0x8000 0x00008000 0x8000   0x0 -r-x mirror_00      
 0x00008000 0x8000 0x00018000 0x8000   0x0 -r-x mirror_01      
+---
 nth              paddr      vaddr bind type size lib name                  
 ---------------------------------------------------------------------------
   0         0x00000347 0x00008347 NONE NONE    0     cop_vector_native
@@ -623,6 +631,7 @@ NAME=snes cx4test
 FILE=bins/snes/cx4test.sfc
 CMDS=<<EOF
 iI
+echo ---
 iH
 EOF
 EXPECT=<<EOF
@@ -660,6 +669,7 @@ canary   false
 pie      false
 relrocs  false
 nx       false
+---
 snes_rom:
   game_title: "CX4 TEST PROGRAM"
   speed: "slow"
diff --git a/test/db/formats/sms b/test/db/formats/sms
index e29a5d14fc..ae64889e46 100644
--- a/test/db/formats/sms
+++ b/test/db/formats/sms
@@ -1,6 +1,12 @@
-NAME=SMS: Open/iI
+NAME=SMS analysis
 FILE=bins/sms/demo.sms
-CMDS=iH;iI
+CMDS=<<EOF
+iH
+echo ---
+iI
+echo ---
+oml
+EOF
 EXPECT=<<EOF
 sms_rom:
   offset: 0x7ff0
@@ -20,6 +26,7 @@ sms_rom:
     name: "64-Color Palette Test Program"
     description: "Author: Charles MacDonald"
 
+---
 arch     z80
 cpu      N/A
 features N/A
@@ -54,13 +61,7 @@ canary   false
 pie      false
 relrocs  false
 nx       false
-EOF
-RUN
-
-NAME=SMS: maps
-FILE=bins/sms/demo.sms
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 3 +0x00000000 0x00000000 * 0x00007fff r-x 
 EOF
 RUN
diff --git a/test/db/formats/spc700 b/test/db/formats/spc700
index a65a6220f8..3eba5b59d8 100644
--- a/test/db/formats/spc700
+++ b/test/db/formats/spc700
@@ -1,28 +1,19 @@
-NAME=SPC700: Open/iI
+NAME=SPC700 analysis
 FILE=bins/spc700/bin.spc
-CMDS=iI~machine[1]
+CMDS=<<EOF
+iI~machine[1]
+echo ---
+iS
+echo ---
+oml
+EOF
 EXPECT=<<EOF
 SPC700
-EOF
-EXPECT_ERR=
-RUN
-
-NAME=SPC700: sections
-FILE=bins/spc700/bin.spc
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr    size      vaddr   vsize align perm name type flags 
 -----------------------------------------------------------------
 0x00000100 0x10000 0x00000000 0x10000   0x0 -r-- RAM       
-EOF
-EXPECT_ERR=
-RUN
-
-NAME=SPC700: maps
-FILE=bins/spc700/bin.spc
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 3 +0x00000100 0x00000000 * 0x0000ffff r-- fmap.RAM
 EOF
-EXPECT_ERR=
 RUN
diff --git a/test/db/formats/vsf/rambo2-norom b/test/db/formats/vsf/rambo2-norom
index caa8c75daf..fb6cabc5fc 100644
--- a/test/db/formats/vsf/rambo2-norom
+++ b/test/db/formats/vsf/rambo2-norom
@@ -1,22 +1,20 @@
+NAME=VSF: Rambo II
+FILE=bins/vsf/c64-rambo2-norom.vsf
+CMDS=<<EOF
+iI~os
+echo ---
+oml
+EOF
+EXPECT=<<EOF
+os       C64
+---
+ 1 fd: 3 +0x00000084 0x00000000 * 0x0000ffff r-x fmap.RAM
+EOF
+RUN
+
 NAME=VSF: Rambo II- open
 FILE=bins/vsf/c64-rambo2-norom.vsf
 ARGS=-A
 CMDS=q!
 EXPECT=
 RUN
-
-NAME=VSF: Rambo II- detection
-FILE=bins/vsf/c64-rambo2-norom.vsf
-CMDS=iI~os
-EXPECT=<<EOF
-os       C64
-EOF
-RUN
-
-NAME=VSF: Rambo II- ROMs
-FILE=bins/vsf/c64-rambo2-norom.vsf
-CMDS=oml
-EXPECT=<<EOF
- 1 fd: 3 +0x00000084 0x00000000 * 0x0000ffff r-x fmap.RAM
-EOF
-RUN
diff --git a/test/db/formats/vsf/rambo2-rom b/test/db/formats/vsf/rambo2-rom
index c790e37e26..462e6f854c 100644
--- a/test/db/formats/vsf/rambo2-rom
+++ b/test/db/formats/vsf/rambo2-rom
@@ -1,24 +1,22 @@
-NAME=VSF: Rambo II- open
+NAME=VSF: Rambo II rom
 FILE=bins/vsf/c64-rambo2-rom.vsf
-ARGS=-A
-CMDS=q!
-EXPECT=
-RUN
-
-NAME=VSF: Rambo II- detection
-FILE=bins/vsf/c64-rambo2-rom.vsf
-CMDS=iI~os
+CMDS=<<EOF
+iI~os
+echo ---
+oml
+EOF
 EXPECT=<<EOF
 os       C64
-EOF
-RUN
-
-NAME=VSF: Rambo II- ROMs
-FILE=bins/vsf/c64-rambo2-rom.vsf
-CMDS=oml
-EXPECT=<<EOF
+---
  1 fd: 3 +0x0001209d 0x0000a000 - 0x0000bfff r-x fmap.BASIC
  2 fd: 3 +0x0001009d 0x0000e000 - 0x0000ffff r-x fmap.KERNAL
  3 fd: 3 +0x00000084 0x00000000 * 0x0000ffff r-x fmap.RAM
 EOF
 RUN
+
+NAME=VSF: Rambo II rom- open
+FILE=bins/vsf/c64-rambo2-rom.vsf
+ARGS=-A
+CMDS=q!
+EXPECT=
+RUN
diff --git a/test/db/formats/vsf/rhps-norom b/test/db/formats/vsf/rhps-norom
index 07a450fb94..7a0ca503c4 100644
--- a/test/db/formats/vsf/rhps-norom
+++ b/test/db/formats/vsf/rhps-norom
@@ -1,23 +1,21 @@
-NAME=VSF: Rocky Horror Picture Show- open
+NAME=VSF: Rocky Horror Picture Show norom
+FILE=bins/vsf/c128-rhps-norom.vsf
+CMDS=<<EOF
+iI~os
+echo ---
+oml
+EOF
+EXPECT=<<EOF
+os       C128
+---
+ 1 fd: 3 +0x0000008c 0x00000000 - 0x0000ffff r-x fmap.RAM BANK 0
+ 2 fd: 3 +0x0001008c 0x00000000 * 0x0000ffff r-x fmap.RAM BANK 1
+EOF
+RUN
+
+NAME=VSF: Rocky Horror Picture Show norom- open
 FILE=bins/vsf/c128-rhps-norom.vsf
 ARGS=-A
 CMDS=q!
 EXPECT=
 RUN
-
-NAME=VSF: Rocky Horror Picture Show- detection
-FILE=bins/vsf/c128-rhps-norom.vsf
-CMDS=iI~os
-EXPECT=<<EOF
-os       C128
-EOF
-RUN
-
-NAME=VSF: Rocky Horror Picture Show- ROMs
-FILE=bins/vsf/c128-rhps-norom.vsf
-CMDS=oml
-EXPECT=<<EOF
- 1 fd: 3 +0x0000008c 0x00000000 - 0x0000ffff r-x fmap.RAM BANK 0
- 2 fd: 3 +0x0001008c 0x00000000 * 0x0000ffff r-x fmap.RAM BANK 1
-EOF
-RUN
diff --git a/test/db/formats/vsf/rhps-rom b/test/db/formats/vsf/rhps-rom
index 24469b1f99..7a0ca503c4 100644
--- a/test/db/formats/vsf/rhps-rom
+++ b/test/db/formats/vsf/rhps-rom
@@ -1,27 +1,21 @@
-NAME=VSF: Rocky Horror Picture Show- open
-FILE=bins/vsf/c128-rhps-rom.vsf
+NAME=VSF: Rocky Horror Picture Show norom
+FILE=bins/vsf/c128-rhps-norom.vsf
+CMDS=<<EOF
+iI~os
+echo ---
+oml
+EOF
+EXPECT=<<EOF
+os       C128
+---
+ 1 fd: 3 +0x0000008c 0x00000000 - 0x0000ffff r-x fmap.RAM BANK 0
+ 2 fd: 3 +0x0001008c 0x00000000 * 0x0000ffff r-x fmap.RAM BANK 1
+EOF
+RUN
+
+NAME=VSF: Rocky Horror Picture Show norom- open
+FILE=bins/vsf/c128-rhps-norom.vsf
 ARGS=-A
 CMDS=q!
 EXPECT=
 RUN
-
-NAME=VSF: Rocky Horror Picture Show- detection
-FILE=bins/vsf/c128-rhps-rom.vsf
-CMDS=iI~os
-EXPECT=<<EOF
-os       C128
-EOF
-RUN
-
-NAME=VSF: Rocky Horror Picture Show- ROMs
-FILE=bins/vsf/c128-rhps-rom.vsf
-CMDS=oml
-EXPECT=<<EOF
- 1 fd: 3 +0x000420a1 0x00004000 - 0x0000afff r-x fmap.BASIC
- 2 fd: 3 +0x000490a1 0x0000b000 - 0x0000bfff r-x fmap.MONITOR
- 3 fd: 3 +0x0004a0a1 0x0000c000 - 0x0000cfff r-x fmap.EDITOR
- 4 fd: 3 +0x000400a1 0x0000e000 - 0x0000ffff r-x fmap.KERNAL
- 5 fd: 3 +0x0000008c 0x00000000 - 0x0000ffff r-x fmap.RAM BANK 0
- 6 fd: 3 +0x0001008c 0x00000000 * 0x0000ffff r-x fmap.RAM BANK 1
-EOF
-RUN