diff --git a/.appveyor.yml b/.appveyor.yml
index 173ec369be..a898183e9d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -106,7 +106,7 @@ for:
       - cd ..
       - "%PYTHON%\\Scripts\\meson test -C build -t 10 --print-errorlogs"
       - cd test
-      - rz-test -o results.json -L db
+      - rz-test -o results.json -e db\esil -L db
       - cd ..
 
   # Include header files from C++
diff --git a/binrz/rz-test/rz-test.c b/binrz/rz-test/rz-test.c
index 7bfe0b1788..dd35185a40 100644
--- a/binrz/rz-test/rz-test.c
+++ b/binrz/rz-test/rz-test.c
@@ -442,7 +442,10 @@ int rz_test_main(int argc, const char **argv) {
 	if (!rz_pvector_empty(except_dir)) {
 		void **it;
 		rz_pvector_foreach (except_dir, it) {
-			const char *p = rz_file_abspath_rel(cwd, (char *)*it), *tp;
+			char *dir_abs_path = rz_file_abspath_rel(cwd, (char *)*it), *tp;
+			if (log_mode || verbose) {
+				printf("Removing tests in dir: %s\n", dir_abs_path);
+			}
 			for (ut32 i = 0; i < rz_pvector_len(&state.db->tests); i++) {
 				RzTest *test = rz_pvector_at(&state.db->tests, i);
 				if (rz_file_is_abspath(test->path)) {
@@ -450,13 +453,18 @@ int rz_test_main(int argc, const char **argv) {
 				} else {
 					tp = rz_file_abspath_rel(cwd, test->path);
 				}
-				if (rz_str_startswith(tp, p)) {
+				if (rz_str_startswith(tp, dir_abs_path)) {
+					if (log_mode || verbose) {
+						char *name = rz_test_test_name(test);
+						printf("Removed test %s: %s\n", test->path, name);
+						free(name);
+					}
 					rz_test_test_free(test);
 					rz_pvector_remove_at(&state.db->tests, i--);
 				}
 				RZ_FREE(tp);
 			}
-			RZ_FREE(p);
+			RZ_FREE(dir_abs_path);
 		}
 	}
 
@@ -616,11 +624,13 @@ static char *readable_elapsed_time(ut64 elapsed) {
 	elapsed /= 1000;
 	ut32 millisecs = elapsed % 1000;
 	elapsed /= 1000;
-	ut32 secs = elapsed % 1000;
-	elapsed /= 1000;
-	ut32 mins = elapsed % 1000;
+	ut32 secs = elapsed % 60;
+	elapsed /= 60;
+	ut32 mins = elapsed % 60;
+	elapsed /= 60;
+	ut32 hours = elapsed % 60;
 
-	return rz_str_newf("%03um%03us%03ums", mins, secs, millisecs);
+	return rz_str_newf("%02uh%02um%02us%03ums", hours, mins, secs, millisecs);
 }
 
 static void test_result_to_json(PJ *pj, RzTestResultInfo *result) {
@@ -934,7 +944,7 @@ static void print_new_results(RzTestState *state, ut64 prev_completed) {
 }
 
 static void print_state_counts(RzTestState *state) {
-	printf("%8" PFMT64u " OK  %8" PFMT64u " BR %8" PFMT64u " XX %8" PFMT64u " FX",
+	printf("%8" PFMT64u " OK  %5" PFMT64u " BR %8" PFMT64u " XX %5" PFMT64u " FX",
 		state->ok_count, state->br_count, state->xx_count, state->fx_count);
 }
 
diff --git a/librz/bin/bfile_string.c b/librz/bin/bfile_string.c
index c51b6297d3..5386e09ade 100644
--- a/librz/bin/bfile_string.c
+++ b/librz/bin/bfile_string.c
@@ -196,8 +196,12 @@ static RzPVector /*<RzBinString *>*/ *string_wildcard_search(
 		rz_search_hit_detail_get_unsigned(hit->detail, &length);
 		bfs->length = length;
 		bfs->size = hit->size;
-		bfs->paddr = hit->address + bf->o->boffset;
-		bfs->vaddr = rz_bin_object_p2v(bf->o, bfs->paddr);
+		bfs->paddr = hit->address;
+		if (bf->o) {
+			// only available when rzbin is used.
+			bfs->paddr += bf->o->boffset;
+			bfs->vaddr = rz_bin_object_p2v(bf->o, bfs->paddr);
+		}
 		bfs->type = opt->string_encoding;
 		rz_pvector_push(bin_strings, bfs);
 	}
diff --git a/test/db/cmd/cmd_i b/test/db/cmd/cmd_i
index e0fa2c2ff4..8f0767f11e 100644
--- a/test/db/cmd/cmd_i
+++ b/test/db/cmd/cmd_i
@@ -43,9 +43,10 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=ib
+NAME=%p
 FILE=bins/elf/analysis/main
 CMDS=<<EOF
+echo ------
 e bin.baddr=0
 e asm.calls=false
 obR
@@ -56,22 +57,12 @@ pi 1
 %p
 EOF
 EXPECT=<<EOF
+------
 xor ebp, ebp
 0x00000410
 EOF
 RUN
 
-NAME=ibib
-FILE=bins/elf/analysis/main
-CMDS=<<EOF
-echo works
-ib;ib
-EOF
-EXPECT=<<EOF
-works
-EOF
-RUN
-
 NAME=ih (file x86)
 FILE=bins/elf/analysis/x86-helloworld-gcc
 CMDS=ihq
@@ -106,6 +97,7 @@ FILE=malloc://1025
 ARGS=-a x86 -b 64
 CMDS=<<EOF
 i
+iI
 ia
 ii
 ie
@@ -123,6 +115,42 @@ format  any
 iorw    true
 block   0x100
 type    
+arch     N/A
+cpu      N/A
+features N/A
+baddr    0x00000000
+binsz    0x00000401
+bintype  N/A
+bits     64
+class    N/A
+compiler N/A
+dbg_file N/A
+endian   LE
+hdr.csum N/A
+guid     N/A
+intrp    N/A
+laddr    0x00000000
+lang     N/A
+machine  N/A
+maxopsz  16
+minopsz  1
+os       N/A
+cc       N/A
+pcalign  1
+rpath    N/A
+subsys   
+stripped false
+crypto   false
+havecode false
+va       false
+sanitiz  false
+static   true
+linenum  false
+lsyms    false
+canary   false
+PIE      false
+RELROCS  false
+NX       false
 [Info]
 arch     N/A
 cpu      N/A
@@ -206,62 +234,6 @@ paddr vaddr len size section type string
 EOF
 RUN
 
-NAME=i (all) (malloc) iI
-FILE=malloc://1024
-ARGS=-a x86 -b 64
-CMDS=<<EOF
-i
-iI
-EOF
-EXPECT=<<EOF
-fd      3
-file    malloc://1024
-size    0x400
-humansz 1K
-mode    rwx
-format  any
-iorw    true
-block   0x100
-type    
-arch     N/A
-cpu      N/A
-features N/A
-baddr    0x00000000
-binsz    0x00000400
-bintype  N/A
-bits     64
-class    N/A
-compiler N/A
-dbg_file N/A
-endian   LE
-hdr.csum N/A
-guid     N/A
-intrp    N/A
-laddr    0x00000000
-lang     N/A
-machine  N/A
-maxopsz  16
-minopsz  1
-os       N/A
-cc       N/A
-pcalign  1
-rpath    N/A
-subsys   
-stripped false
-crypto   false
-havecode false
-va       false
-sanitiz  false
-static   true
-linenum  false
-lsyms    false
-canary   false
-PIE      false
-RELROCS  false
-NX       false
-EOF
-RUN
-
 NAME=i (file x86)
 FILE=bins/elf/analysis/x86-helloworld-gcc
 CMDS=i~!file
@@ -549,18 +521,9 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=ic?
-BROKEN=1
+NAME=ic & icc
 FILE=bins/elf/libmagic.so
-CMDS=ic?~?Usage
-EXPECT=<<EOF
-1
-EOF
-RUN
-
-NAME=icc
-FILE=bins/elf/libmagic.so
-CMDS=icc
+CMDS=icc;ic;icf;icm
 EXPECT=<<EOF
 class SystemClassLoaderInjector {
   public:
@@ -694,13 +657,6 @@ class std::type_info {
     void operator==(std::type_info const&) const;
     void __do_catch(std::type_info const*, void**, unsigned int) const;
 }
-EOF
-RUN
-
-NAME=ic
-FILE=bins/elf/libmagic.so
-CMDS=ic;icf;icm
-EXPECT=<<EOF
    address        min        max name                                  super 
 -----------------------------------------------------------------------------
 ---------- 0x0000699c 0x000074f8 SystemClassLoaderInjector             
@@ -802,9 +758,9 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=iq
+NAME=iq & iaq
 FILE=bins/elf/libmagic.so
-CMDS=iq
+CMDS=iq;iaq
 EXPECT=<<EOF
 arch arm
 cpu N/A
@@ -815,13 +771,6 @@ endian little
 minopsz 2
 maxopsz 4
 pcalign 2
-EOF
-RUN
-
-NAME=iaq
-FILE=bins/elf/libmagic.so
-CMDS=iaq
-EXPECT=<<EOF
 arch arm
 cpu N/A
 features N/A
@@ -1740,42 +1689,46 @@ unit example sumofsquares(longint)longint
 EOF
 RUN
 
-NAME=ie (file x86)
+NAME=info (file x86)
 FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=ie
-EXPECT=<<EOF
-     vaddr      paddr     hvaddr      haddr type    
-----------------------------------------------------
-0x08048300 0x00000300 0x08048018 0x00000018 program
-0x080483d0 0x000003d0 0x0804959c 0x0000059c init
-0x080483b0 0x000003b0 0x080495a0 0x000005a0 fini
+CMDS=<<EOF
+ii
+echo --------
+iI
+echo --------
+iIj~{}
+echo --------
+ie
+echo --------
+iej
+echo --------
+iS
+echo --------
+iSS
+echo --------
+iSj
+echo --------
+iSSj
+echo --------
+iS:paddr/cols/vaddr/perm/name
+echo --------
+iSS:paddr/cols/vaddr/perm/name
+echo --------
+il
+echo --------
+ir
+echo --------
+irq
+echo --------
+is
 EOF
-RUN
-
-NAME=iej (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iej
-EXPECT=<<EOF
-[{"vaddr":134513408,"paddr":768,"baddr":134512640,"laddr":0,"hvaddr":134512664,"haddr":24,"type":"program"},{"vaddr":134513616,"paddr":976,"baddr":134512640,"laddr":0,"hvaddr":134518172,"haddr":1436,"type":"init"},{"vaddr":134513584,"paddr":944,"baddr":134512640,"laddr":0,"hvaddr":134518176,"haddr":1440,"type":"fini"}]
-EOF
-RUN
-
-NAME=ii (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=ii
 EXPECT=<<EOF
 nth      vaddr bind   type   lib name              
 ---------------------------------------------------
   1 0x080482d0 GLOBAL FUNC       puts
   2 0x080482e0 WEAK   NOTYPE     __gmon_start__
   3 0x080482f0 GLOBAL FUNC       __libc_start_main
-EOF
-RUN
-
-NAME=iI (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iI
-EXPECT=<<EOF
+--------
 arch     x86
 cpu      N/A
 features N/A
@@ -1813,13 +1766,7 @@ canary   false
 PIE      false
 RELROCS  true
 NX       true
-EOF
-RUN
-
-NAME=iIj
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iIj~{}
-EXPECT=<<EOF
+--------
 {
   "arch": "x86",
   "baddr": 134512640,
@@ -1853,6 +1800,193 @@ EXPECT=<<EOF
   "RELROCS": true,
   "NX": true
 }
+--------
+     vaddr      paddr     hvaddr      haddr type    
+----------------------------------------------------
+0x08048300 0x00000300 0x08048018 0x00000018 program
+0x080483d0 0x000003d0 0x0804959c 0x0000059c init
+0x080483b0 0x000003b0 0x080495a0 0x000005a0 fini
+--------
+[{"vaddr":134513408,"paddr":768,"baddr":134512640,"laddr":0,"hvaddr":134512664,"haddr":24,"type":"program"},{"vaddr":134513616,"paddr":976,"baddr":134512640,"laddr":0,"hvaddr":134518172,"haddr":1436,"type":"init"},{"vaddr":134513584,"paddr":944,"baddr":134512640,"laddr":0,"hvaddr":134518176,"haddr":1440,"type":"fini"}]
+--------
+     paddr  size      vaddr vsize align perm name               type       flags         
+-----------------------------------------------------------------------------------------
+0x00000000   0x0 ----------   0x0   0x0 ----                    NULL       
+0x00000134  0x13 0x08048134  0x13   0x0 -r-- .interp            PROGBITS   alloc
+0x00000148  0x20 0x08048148  0x20   0x0 -r-- .note.ABI-tag      NOTE       alloc
+0x00000168  0x24 0x08048168  0x24   0x0 -r-- .note.gnu.build-id NOTE       alloc
+0x0000018c  0x20 0x0804818c  0x20   0x0 -r-- .gnu.hash          GNU_HASH   alloc
+0x000001ac  0x50 0x080481ac  0x50   0x0 -r-- .dynsym            DYNSYM     alloc
+0x000001fc  0x4a 0x080481fc  0x4a   0x0 -r-- .dynstr            STRTAB     alloc
+0x00000246   0xa 0x08048246   0xa   0x0 -r-- .gnu.version       VERSYM     alloc
+0x00000250  0x20 0x08048250  0x20   0x0 -r-- .gnu.version_r     VERNEED    alloc
+0x00000270   0x8 0x08048270   0x8   0x0 -r-- .rel.dyn           REL        alloc
+0x00000278  0x18 0x08048278  0x18   0x0 -r-- .rel.plt           REL        alloc
+0x00000290  0x23 0x08048290  0x23   0x0 -r-x .init              PROGBITS   alloc,execute
+0x000002c0  0x40 0x080482c0  0x40   0x0 -r-x .plt               PROGBITS   alloc,execute
+0x00000300 0x194 0x08048300 0x194   0x0 -r-x .text              PROGBITS   alloc,execute
+0x00000494  0x14 0x08048494  0x14   0x0 -r-x .fini              PROGBITS   alloc,execute
+0x000004a8  0x15 0x080484a8  0x15   0x0 -r-- .rodata            PROGBITS   alloc
+0x000004c0  0x2c 0x080484c0  0x2c   0x0 -r-- .eh_frame_hdr      PROGBITS   alloc
+0x000004ec  0xb0 0x080484ec  0xb0   0x0 -r-- .eh_frame          PROGBITS   alloc
+0x0000059c   0x4 0x0804959c   0x4   0x0 -rw- .init_array        INIT_ARRAY write,alloc
+0x000005a0   0x4 0x080495a0   0x4   0x0 -rw- .fini_array        FINI_ARRAY write,alloc
+0x000005a4   0x4 0x080495a4   0x4   0x0 -rw- .jcr               PROGBITS   write,alloc
+0x000005a8  0xe8 0x080495a8  0xe8   0x0 -rw- .dynamic           DYNAMIC    write,alloc
+0x00000690   0x4 0x08049690   0x4   0x0 -rw- .got               PROGBITS   write,alloc
+0x00000694  0x18 0x08049694  0x18   0x0 -rw- .got.plt           PROGBITS   write,alloc
+0x000006ac   0x8 0x080496ac   0x8   0x0 -rw- .data              PROGBITS   write,alloc
+0x000006b4   0x0 0x080496b4   0x4   0x0 -rw- .bss               NOBITS     write,alloc
+0x000006b4  0x11 ----------  0x11   0x0 ---- .comment           PROGBITS   merge,strings
+0x000006c5 0x106 ---------- 0x106   0x0 ---- .shstrtab          STRTAB     
+0x00000c7c 0x450 ---------- 0x450   0x0 ---- .symtab            SYMTAB     
+0x000010cc 0x257 ---------- 0x257   0x0 ---- .strtab            STRTAB     
+--------
+     paddr  size      vaddr vsize  align perm name         
+-----------------------------------------------------------
+0x00000034 0x100 0x08048034 0x100    0x4 -r-x PHDR
+0x00000134  0x13 0x08048134  0x13    0x1 -r-- INTERP
+0x00000000 0x59c 0x08048000 0x59c 0x1000 -r-x LOAD0
+0x0000059c 0x118 0x0804959c 0x11c 0x1000 -rw- LOAD1
+0x000005a8  0xe8 0x080495a8  0xe8    0x4 -rw- DYNAMIC
+0x00000148  0x44 0x08048148  0x44    0x4 -r-- NOTE
+0x000004c0  0x2c 0x080484c0  0x2c    0x4 -r-- GNU_EH_FRAME
+0x00000000   0x0 0x00000000   0x0    0x4 -rw- GNU_STACK
+0x00000000  0x34 0x08048000  0x34    0x0 -rw- ehdr
+--------
+[{"name":"","size":0,"vsize":0,"perm":"----","type":"NULL","paddr":0,"vaddr":18446744073709551615},{"name":".interp","size":19,"vsize":19,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":308,"vaddr":134512948},{"name":".note.ABI-tag","size":32,"vsize":32,"perm":"-r--","type":"NOTE","flags":["alloc"],"paddr":328,"vaddr":134512968},{"name":".note.gnu.build-id","size":36,"vsize":36,"perm":"-r--","type":"NOTE","flags":["alloc"],"paddr":360,"vaddr":134513000},{"name":".gnu.hash","size":32,"vsize":32,"perm":"-r--","type":"GNU_HASH","flags":["alloc"],"paddr":396,"vaddr":134513036},{"name":".dynsym","size":80,"vsize":80,"perm":"-r--","type":"DYNSYM","flags":["alloc"],"paddr":428,"vaddr":134513068},{"name":".dynstr","size":74,"vsize":74,"perm":"-r--","type":"STRTAB","flags":["alloc"],"paddr":508,"vaddr":134513148},{"name":".gnu.version","size":10,"vsize":10,"perm":"-r--","type":"VERSYM","flags":["alloc"],"paddr":582,"vaddr":134513222},{"name":".gnu.version_r","size":32,"vsize":32,"perm":"-r--","type":"VERNEED","flags":["alloc"],"paddr":592,"vaddr":134513232},{"name":".rel.dyn","size":8,"vsize":8,"perm":"-r--","type":"REL","flags":["alloc"],"paddr":624,"vaddr":134513264},{"name":".rel.plt","size":24,"vsize":24,"perm":"-r--","type":"REL","flags":["alloc"],"paddr":632,"vaddr":134513272},{"name":".init","size":35,"vsize":35,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":656,"vaddr":134513296},{"name":".plt","size":64,"vsize":64,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":704,"vaddr":134513344},{"name":".text","size":404,"vsize":404,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":768,"vaddr":134513408},{"name":".fini","size":20,"vsize":20,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":1172,"vaddr":134513812},{"name":".rodata","size":21,"vsize":21,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":1192,"vaddr":134513832},{"name":".eh_frame_hdr","size":44,"vsize":44,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":1216,"vaddr":134513856},{"name":".eh_frame","size":176,"vsize":176,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":1260,"vaddr":134513900},{"name":".init_array","size":4,"vsize":4,"perm":"-rw-","type":"INIT_ARRAY","flags":["write","alloc"],"paddr":1436,"vaddr":134518172},{"name":".fini_array","size":4,"vsize":4,"perm":"-rw-","type":"FINI_ARRAY","flags":["write","alloc"],"paddr":1440,"vaddr":134518176},{"name":".jcr","size":4,"vsize":4,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1444,"vaddr":134518180},{"name":".dynamic","size":232,"vsize":232,"perm":"-rw-","type":"DYNAMIC","flags":["write","alloc"],"paddr":1448,"vaddr":134518184},{"name":".got","size":4,"vsize":4,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1680,"vaddr":134518416},{"name":".got.plt","size":24,"vsize":24,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1684,"vaddr":134518420},{"name":".data","size":8,"vsize":8,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1708,"vaddr":134518444},{"name":".bss","size":0,"vsize":4,"perm":"-rw-","type":"NOBITS","flags":["write","alloc"],"paddr":1716,"vaddr":134518452},{"name":".comment","size":17,"vsize":17,"perm":"----","type":"PROGBITS","flags":["merge","strings"],"paddr":1716,"vaddr":18446744073709551615},{"name":".shstrtab","size":262,"vsize":262,"perm":"----","type":"STRTAB","paddr":1733,"vaddr":18446744073709551615},{"name":".symtab","size":1104,"vsize":1104,"perm":"----","type":"SYMTAB","paddr":3196,"vaddr":18446744073709551615},{"name":".strtab","size":599,"vsize":599,"perm":"----","type":"STRTAB","paddr":4300,"vaddr":18446744073709551615}]
+--------
+[{"name":"PHDR","size":256,"vsize":256,"perm":"-r-x","paddr":52,"vaddr":134512692,"align":4},{"name":"INTERP","size":19,"vsize":19,"perm":"-r--","paddr":308,"vaddr":134512948},{"name":"LOAD0","size":1436,"vsize":1436,"perm":"-r-x","paddr":0,"vaddr":134512640,"align":4096},{"name":"LOAD1","size":280,"vsize":284,"perm":"-rw-","paddr":1436,"vaddr":134518172,"align":4096},{"name":"DYNAMIC","size":232,"vsize":232,"perm":"-rw-","paddr":1448,"vaddr":134518184,"align":4},{"name":"NOTE","size":68,"vsize":68,"perm":"-r--","paddr":328,"vaddr":134512968,"align":4},{"name":"GNU_EH_FRAME","size":44,"vsize":44,"perm":"-r--","paddr":1216,"vaddr":134513856,"align":4},{"name":"GNU_STACK","size":0,"vsize":0,"perm":"-rw-","paddr":0,"vaddr":0,"align":4},{"name":"ehdr","size":52,"vsize":52,"perm":"-rw-","paddr":0,"vaddr":134512640}]
+--------
+     paddr      vaddr perm name               
+----------------------------------------------
+0x00000000 ---------- ---- 
+0x00000134 0x08048134 -r-- .interp
+0x00000148 0x08048148 -r-- .note.ABI-tag
+0x00000168 0x08048168 -r-- .note.gnu.build-id
+0x0000018c 0x0804818c -r-- .gnu.hash
+0x000001ac 0x080481ac -r-- .dynsym
+0x000001fc 0x080481fc -r-- .dynstr
+0x00000246 0x08048246 -r-- .gnu.version
+0x00000250 0x08048250 -r-- .gnu.version_r
+0x00000270 0x08048270 -r-- .rel.dyn
+0x00000278 0x08048278 -r-- .rel.plt
+0x00000290 0x08048290 -r-x .init
+0x000002c0 0x080482c0 -r-x .plt
+0x00000300 0x08048300 -r-x .text
+0x00000494 0x08048494 -r-x .fini
+0x000004a8 0x080484a8 -r-- .rodata
+0x000004c0 0x080484c0 -r-- .eh_frame_hdr
+0x000004ec 0x080484ec -r-- .eh_frame
+0x0000059c 0x0804959c -rw- .init_array
+0x000005a0 0x080495a0 -rw- .fini_array
+0x000005a4 0x080495a4 -rw- .jcr
+0x000005a8 0x080495a8 -rw- .dynamic
+0x00000690 0x08049690 -rw- .got
+0x00000694 0x08049694 -rw- .got.plt
+0x000006ac 0x080496ac -rw- .data
+0x000006b4 0x080496b4 -rw- .bss
+0x000006b4 ---------- ---- .comment
+0x000006c5 ---------- ---- .shstrtab
+0x00000c7c ---------- ---- .symtab
+0x000010cc ---------- ---- .strtab
+--------
+     paddr      vaddr perm name         
+----------------------------------------
+0x00000034 0x08048034 -r-x PHDR
+0x00000134 0x08048134 -r-- INTERP
+0x00000000 0x08048000 -r-x LOAD0
+0x0000059c 0x0804959c -rw- LOAD1
+0x000005a8 0x080495a8 -rw- DYNAMIC
+0x00000148 0x08048148 -r-- NOTE
+0x000004c0 0x080484c0 -r-- GNU_EH_FRAME
+0x00000000 0x00000000 -rw- GNU_STACK
+0x00000000 0x08048000 -rw- ehdr
+--------
+library   
+----------
+libc.so.6
+--------
+     vaddr      paddr type           name              
+-------------------------------------------------------
+0x08049690 0x00000690 R_386_GLOB_DAT __gmon_start__
+0x080496a0 0x000006a0 R_386_JMP_SLOT puts
+0x080496a4 0x000006a4 R_386_JMP_SLOT __gmon_start__
+0x080496a8 0x000006a8 R_386_JMP_SLOT __libc_start_main
+--------
+0x08049690  __gmon_start__
+0x080496a0  puts
+0x080496a4  __gmon_start__
+0x080496a8  __libc_start_main
+--------
+nth      paddr      vaddr bind   type   size lib name                                   
+----------------------------------------------------------------------------------------
+  4 0x000004ac 0x080484ac GLOBAL OBJ       4     _IO_stdin_used
+  1 0x00000134 0x08048134 LOCAL  SECT      0     .interp
+  2 0x00000148 0x08048148 LOCAL  SECT      0     .note.ABI-tag
+  3 0x00000168 0x08048168 LOCAL  SECT      0     .note.gnu.build-id
+  4 0x0000018c 0x0804818c LOCAL  SECT      0     .gnu.hash
+  5 0x000001ac 0x080481ac LOCAL  SECT      0     .dynsym
+  6 0x000001fc 0x080481fc LOCAL  SECT      0     .dynstr
+  7 0x00000246 0x08048246 LOCAL  SECT      0     .gnu.version
+  8 0x00000250 0x08048250 LOCAL  SECT      0     .gnu.version_r
+  9 0x00000270 0x08048270 LOCAL  SECT      0     .rel.dyn
+ 10 0x00000278 0x08048278 LOCAL  SECT      0     .rel.plt
+ 11 0x00000290 0x08048290 LOCAL  SECT      0     .init
+ 12 0x000002c0 0x080482c0 LOCAL  SECT      0     .plt
+ 13 0x00000300 0x08048300 LOCAL  SECT      0     .text
+ 14 0x00000494 0x08048494 LOCAL  SECT      0     .fini
+ 15 0x000004a8 0x080484a8 LOCAL  SECT      0     .rodata
+ 16 0x000004c0 0x080484c0 LOCAL  SECT      0     .eh_frame_hdr
+ 17 0x000004ec 0x080484ec LOCAL  SECT      0     .eh_frame
+ 18 0x0000059c 0x0804959c LOCAL  SECT      0     .init_array
+ 19 0x000005a0 0x080495a0 LOCAL  SECT      0     .fini_array
+ 20 0x000005a4 0x080495a4 LOCAL  SECT      0     .jcr
+ 21 0x000005a8 0x080495a8 LOCAL  SECT      0     .dynamic
+ 22 0x00000690 0x08049690 LOCAL  SECT      0     .got
+ 23 0x00000694 0x08049694 LOCAL  SECT      0     .got.plt
+ 24 0x000006ac 0x080496ac LOCAL  SECT      0     .data
+ 25 ---------- 0x080496b4 LOCAL  SECT      0     .bss
+ 26 ---------- 0x00000000 LOCAL  SECT      0     .comment
+ 27 ---------- 0x00000000 LOCAL  FILE      0     init.c
+ 28 ---------- 0x00000000 LOCAL  FILE      0     unknown_28
+ 29 ---------- 0x00000000 LOCAL  FILE      0     crtstuff.c
+ 30 0x000005a4 0x080495a4 LOCAL  OBJ       0     __JCR_LIST__
+ 31 0x00000340 0x08048340 LOCAL  FUNC      0     deregister_tm_clones
+ 32 0x00000370 0x08048370 LOCAL  FUNC      0     register_tm_clones
+ 33 0x000003b0 0x080483b0 LOCAL  FUNC      0     __do_global_dtors_aux
+ 34 ---------- 0x080496b4 LOCAL  OBJ       1     completed.5979
+ 35 0x000005a0 0x080495a0 LOCAL  OBJ       0     __do_global_dtors_aux_fini_array_entry
+ 36 0x000003d0 0x080483d0 LOCAL  FUNC      0     frame_dummy
+ 37 0x0000059c 0x0804959c LOCAL  OBJ       0     __frame_dummy_init_array_entry
+ 38 ---------- 0x00000000 LOCAL  FILE      0     hello.c
+ 39 ---------- 0x00000000 LOCAL  FILE      0     crtstuff.c
+ 40 0x00000598 0x08048598 LOCAL  OBJ       0     __FRAME_END__
+ 41 0x000005a4 0x080495a4 LOCAL  OBJ       0     __JCR_END__
+ 42 ---------- 0x00000000 LOCAL  FILE      0     unknown_42
+ 43 0x000005a0 0x080495a0 LOCAL  NOTYPE    0     __init_array_end
+ 44 0x000005a8 0x080495a8 LOCAL  OBJ       0     _DYNAMIC
+ 45 0x0000059c 0x0804959c LOCAL  NOTYPE    0     __init_array_start
+ 46 0x00000694 0x08049694 LOCAL  OBJ       0     _GLOBAL_OFFSET_TABLE_
+ 47 0x00000490 0x08048490 GLOBAL FUNC      2     __libc_csu_fini
+ 49 0x00000330 0x08048330 GLOBAL FUNC      4     __x86.get_pc_thunk.bx
+ 50 0x000006ac 0x080496ac WEAK   NOTYPE    0     data_start
+ 51 ---------- 0x080496b4 GLOBAL NOTYPE    0     _edata
+ 52 0x00000494 0x08048494 GLOBAL FUNC      0     _fini
+ 53 0x000006ac 0x080496ac GLOBAL NOTYPE    0     __data_start
+ 56 0x000006b0 0x080496b0 GLOBAL OBJ       0     __dso_handle
+ 57 0x000004ac 0x080484ac GLOBAL OBJ       4     _IO_stdin_used
+ 59 0x00000420 0x08048420 GLOBAL FUNC     97     __libc_csu_init
+ 60 ---------- 0x080496b8 GLOBAL NOTYPE    0     _end
+ 61 0x00000300 0x08048300 GLOBAL FUNC      0     _start
+ 62 0x000004a8 0x080484a8 GLOBAL OBJ       4     _fp_hw
+ 63 ---------- 0x080496b4 GLOBAL NOTYPE    0     __bss_start
+ 64 0x00000400 0x08048400 GLOBAL FUNC     28     main
+ 66 ---------- 0x080496b4 GLOBAL OBJ       0     __TMC_END__
+ 68 0x00000290 0x08048290 GLOBAL FUNC      0     _init
+  1 0x000002d0 0x080482d0 GLOBAL FUNC     16     imp.puts
+  2 0x000002e0 0x080482e0 WEAK   NOTYPE   16     imp.__gmon_start__
+  3 0x000002f0 0x080482f0 GLOBAL FUNC     16     imp.__libc_start_main
 EOF
 RUN
 
@@ -1874,24 +2008,18 @@ RUN
 
 NAME=im
 FILE=bins/nes/Pong.nes
-CMDS=im~?SRAM
+CMDS=<<EOF
+im~?SRAM
+echo --------
+imj~?SRAM
+echo --------
+imq
+EOF
 EXPECT=<<EOF
 1
-EOF
-RUN
-
-NAME=imj
-FILE=bins/nes/Pong.nes
-CMDS=imj~?SRAM
-EXPECT=<<EOF
+--------
 1
-EOF
-RUN
-
-NAME=imq
-FILE=bins/nes/Pong.nes
-CMDS=imq
-EXPECT=<<EOF
+--------
 0x00000000
 0x00001000
 0x00001800
@@ -2924,141 +3052,14 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=iS (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize align perm name               type       flags         
------------------------------------------------------------------------------------------
-0x00000000   0x0 ----------   0x0   0x0 ----                    NULL       
-0x00000134  0x13 0x08048134  0x13   0x0 -r-- .interp            PROGBITS   alloc
-0x00000148  0x20 0x08048148  0x20   0x0 -r-- .note.ABI-tag      NOTE       alloc
-0x00000168  0x24 0x08048168  0x24   0x0 -r-- .note.gnu.build-id NOTE       alloc
-0x0000018c  0x20 0x0804818c  0x20   0x0 -r-- .gnu.hash          GNU_HASH   alloc
-0x000001ac  0x50 0x080481ac  0x50   0x0 -r-- .dynsym            DYNSYM     alloc
-0x000001fc  0x4a 0x080481fc  0x4a   0x0 -r-- .dynstr            STRTAB     alloc
-0x00000246   0xa 0x08048246   0xa   0x0 -r-- .gnu.version       VERSYM     alloc
-0x00000250  0x20 0x08048250  0x20   0x0 -r-- .gnu.version_r     VERNEED    alloc
-0x00000270   0x8 0x08048270   0x8   0x0 -r-- .rel.dyn           REL        alloc
-0x00000278  0x18 0x08048278  0x18   0x0 -r-- .rel.plt           REL        alloc
-0x00000290  0x23 0x08048290  0x23   0x0 -r-x .init              PROGBITS   alloc,execute
-0x000002c0  0x40 0x080482c0  0x40   0x0 -r-x .plt               PROGBITS   alloc,execute
-0x00000300 0x194 0x08048300 0x194   0x0 -r-x .text              PROGBITS   alloc,execute
-0x00000494  0x14 0x08048494  0x14   0x0 -r-x .fini              PROGBITS   alloc,execute
-0x000004a8  0x15 0x080484a8  0x15   0x0 -r-- .rodata            PROGBITS   alloc
-0x000004c0  0x2c 0x080484c0  0x2c   0x0 -r-- .eh_frame_hdr      PROGBITS   alloc
-0x000004ec  0xb0 0x080484ec  0xb0   0x0 -r-- .eh_frame          PROGBITS   alloc
-0x0000059c   0x4 0x0804959c   0x4   0x0 -rw- .init_array        INIT_ARRAY write,alloc
-0x000005a0   0x4 0x080495a0   0x4   0x0 -rw- .fini_array        FINI_ARRAY write,alloc
-0x000005a4   0x4 0x080495a4   0x4   0x0 -rw- .jcr               PROGBITS   write,alloc
-0x000005a8  0xe8 0x080495a8  0xe8   0x0 -rw- .dynamic           DYNAMIC    write,alloc
-0x00000690   0x4 0x08049690   0x4   0x0 -rw- .got               PROGBITS   write,alloc
-0x00000694  0x18 0x08049694  0x18   0x0 -rw- .got.plt           PROGBITS   write,alloc
-0x000006ac   0x8 0x080496ac   0x8   0x0 -rw- .data              PROGBITS   write,alloc
-0x000006b4   0x0 0x080496b4   0x4   0x0 -rw- .bss               NOBITS     write,alloc
-0x000006b4  0x11 ----------  0x11   0x0 ---- .comment           PROGBITS   merge,strings
-0x000006c5 0x106 ---------- 0x106   0x0 ---- .shstrtab          STRTAB     
-0x00000c7c 0x450 ---------- 0x450   0x0 ---- .symtab            SYMTAB     
-0x000010cc 0x257 ---------- 0x257   0x0 ---- .strtab            STRTAB     
-EOF
-RUN
-
-NAME=iSS (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iSS
-EXPECT=<<EOF
-     paddr  size      vaddr vsize  align perm name         
------------------------------------------------------------
-0x00000034 0x100 0x08048034 0x100    0x4 -r-x PHDR
-0x00000134  0x13 0x08048134  0x13    0x1 -r-- INTERP
-0x00000000 0x59c 0x08048000 0x59c 0x1000 -r-x LOAD0
-0x0000059c 0x118 0x0804959c 0x11c 0x1000 -rw- LOAD1
-0x000005a8  0xe8 0x080495a8  0xe8    0x4 -rw- DYNAMIC
-0x00000148  0x44 0x08048148  0x44    0x4 -r-- NOTE
-0x000004c0  0x2c 0x080484c0  0x2c    0x4 -r-- GNU_EH_FRAME
-0x00000000   0x0 0x00000000   0x0    0x4 -rw- GNU_STACK
-0x00000000  0x34 0x08048000  0x34    0x0 -rw- ehdr
-EOF
-RUN
-
-NAME=iSj
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iSj
-EXPECT=<<EOF
-[{"name":"","size":0,"vsize":0,"perm":"----","type":"NULL","paddr":0,"vaddr":18446744073709551615},{"name":".interp","size":19,"vsize":19,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":308,"vaddr":134512948},{"name":".note.ABI-tag","size":32,"vsize":32,"perm":"-r--","type":"NOTE","flags":["alloc"],"paddr":328,"vaddr":134512968},{"name":".note.gnu.build-id","size":36,"vsize":36,"perm":"-r--","type":"NOTE","flags":["alloc"],"paddr":360,"vaddr":134513000},{"name":".gnu.hash","size":32,"vsize":32,"perm":"-r--","type":"GNU_HASH","flags":["alloc"],"paddr":396,"vaddr":134513036},{"name":".dynsym","size":80,"vsize":80,"perm":"-r--","type":"DYNSYM","flags":["alloc"],"paddr":428,"vaddr":134513068},{"name":".dynstr","size":74,"vsize":74,"perm":"-r--","type":"STRTAB","flags":["alloc"],"paddr":508,"vaddr":134513148},{"name":".gnu.version","size":10,"vsize":10,"perm":"-r--","type":"VERSYM","flags":["alloc"],"paddr":582,"vaddr":134513222},{"name":".gnu.version_r","size":32,"vsize":32,"perm":"-r--","type":"VERNEED","flags":["alloc"],"paddr":592,"vaddr":134513232},{"name":".rel.dyn","size":8,"vsize":8,"perm":"-r--","type":"REL","flags":["alloc"],"paddr":624,"vaddr":134513264},{"name":".rel.plt","size":24,"vsize":24,"perm":"-r--","type":"REL","flags":["alloc"],"paddr":632,"vaddr":134513272},{"name":".init","size":35,"vsize":35,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":656,"vaddr":134513296},{"name":".plt","size":64,"vsize":64,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":704,"vaddr":134513344},{"name":".text","size":404,"vsize":404,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":768,"vaddr":134513408},{"name":".fini","size":20,"vsize":20,"perm":"-r-x","type":"PROGBITS","flags":["alloc","execute"],"paddr":1172,"vaddr":134513812},{"name":".rodata","size":21,"vsize":21,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":1192,"vaddr":134513832},{"name":".eh_frame_hdr","size":44,"vsize":44,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":1216,"vaddr":134513856},{"name":".eh_frame","size":176,"vsize":176,"perm":"-r--","type":"PROGBITS","flags":["alloc"],"paddr":1260,"vaddr":134513900},{"name":".init_array","size":4,"vsize":4,"perm":"-rw-","type":"INIT_ARRAY","flags":["write","alloc"],"paddr":1436,"vaddr":134518172},{"name":".fini_array","size":4,"vsize":4,"perm":"-rw-","type":"FINI_ARRAY","flags":["write","alloc"],"paddr":1440,"vaddr":134518176},{"name":".jcr","size":4,"vsize":4,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1444,"vaddr":134518180},{"name":".dynamic","size":232,"vsize":232,"perm":"-rw-","type":"DYNAMIC","flags":["write","alloc"],"paddr":1448,"vaddr":134518184},{"name":".got","size":4,"vsize":4,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1680,"vaddr":134518416},{"name":".got.plt","size":24,"vsize":24,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1684,"vaddr":134518420},{"name":".data","size":8,"vsize":8,"perm":"-rw-","type":"PROGBITS","flags":["write","alloc"],"paddr":1708,"vaddr":134518444},{"name":".bss","size":0,"vsize":4,"perm":"-rw-","type":"NOBITS","flags":["write","alloc"],"paddr":1716,"vaddr":134518452},{"name":".comment","size":17,"vsize":17,"perm":"----","type":"PROGBITS","flags":["merge","strings"],"paddr":1716,"vaddr":18446744073709551615},{"name":".shstrtab","size":262,"vsize":262,"perm":"----","type":"STRTAB","paddr":1733,"vaddr":18446744073709551615},{"name":".symtab","size":1104,"vsize":1104,"perm":"----","type":"SYMTAB","paddr":3196,"vaddr":18446744073709551615},{"name":".strtab","size":599,"vsize":599,"perm":"----","type":"STRTAB","paddr":4300,"vaddr":18446744073709551615}]
-EOF
-RUN
-
-NAME=iSSj
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iSSj
-EXPECT=<<EOF
-[{"name":"PHDR","size":256,"vsize":256,"perm":"-r-x","paddr":52,"vaddr":134512692,"align":4},{"name":"INTERP","size":19,"vsize":19,"perm":"-r--","paddr":308,"vaddr":134512948},{"name":"LOAD0","size":1436,"vsize":1436,"perm":"-r-x","paddr":0,"vaddr":134512640,"align":4096},{"name":"LOAD1","size":280,"vsize":284,"perm":"-rw-","paddr":1436,"vaddr":134518172,"align":4096},{"name":"DYNAMIC","size":232,"vsize":232,"perm":"-rw-","paddr":1448,"vaddr":134518184,"align":4},{"name":"NOTE","size":68,"vsize":68,"perm":"-r--","paddr":328,"vaddr":134512968,"align":4},{"name":"GNU_EH_FRAME","size":44,"vsize":44,"perm":"-r--","paddr":1216,"vaddr":134513856,"align":4},{"name":"GNU_STACK","size":0,"vsize":0,"perm":"-rw-","paddr":0,"vaddr":0,"align":4},{"name":"ehdr","size":52,"vsize":52,"perm":"-rw-","paddr":0,"vaddr":134512640}]
-EOF
-RUN
-
-NAME=iSq
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iS:paddr/cols/vaddr/perm/name
-EXPECT=<<EOF
-     paddr      vaddr perm name               
-----------------------------------------------
-0x00000000 ---------- ---- 
-0x00000134 0x08048134 -r-- .interp
-0x00000148 0x08048148 -r-- .note.ABI-tag
-0x00000168 0x08048168 -r-- .note.gnu.build-id
-0x0000018c 0x0804818c -r-- .gnu.hash
-0x000001ac 0x080481ac -r-- .dynsym
-0x000001fc 0x080481fc -r-- .dynstr
-0x00000246 0x08048246 -r-- .gnu.version
-0x00000250 0x08048250 -r-- .gnu.version_r
-0x00000270 0x08048270 -r-- .rel.dyn
-0x00000278 0x08048278 -r-- .rel.plt
-0x00000290 0x08048290 -r-x .init
-0x000002c0 0x080482c0 -r-x .plt
-0x00000300 0x08048300 -r-x .text
-0x00000494 0x08048494 -r-x .fini
-0x000004a8 0x080484a8 -r-- .rodata
-0x000004c0 0x080484c0 -r-- .eh_frame_hdr
-0x000004ec 0x080484ec -r-- .eh_frame
-0x0000059c 0x0804959c -rw- .init_array
-0x000005a0 0x080495a0 -rw- .fini_array
-0x000005a4 0x080495a4 -rw- .jcr
-0x000005a8 0x080495a8 -rw- .dynamic
-0x00000690 0x08049690 -rw- .got
-0x00000694 0x08049694 -rw- .got.plt
-0x000006ac 0x080496ac -rw- .data
-0x000006b4 0x080496b4 -rw- .bss
-0x000006b4 ---------- ---- .comment
-0x000006c5 ---------- ---- .shstrtab
-0x00000c7c ---------- ---- .symtab
-0x000010cc ---------- ---- .strtab
-EOF
-RUN
-
-NAME=iSSq
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=iSS:paddr/cols/vaddr/perm/name
-EXPECT=<<EOF
-     paddr      vaddr perm name         
-----------------------------------------
-0x00000034 0x08048034 -r-x PHDR
-0x00000134 0x08048134 -r-- INTERP
-0x00000000 0x08048000 -r-x LOAD0
-0x0000059c 0x0804959c -rw- LOAD1
-0x000005a8 0x080495a8 -rw- DYNAMIC
-0x00000148 0x08048148 -r-- NOTE
-0x000004c0 0x080484c0 -r-- GNU_EH_FRAME
-0x00000000 0x00000000 -rw- GNU_STACK
-0x00000000 0x08048000 -rw- ehdr
-EOF
-RUN
-
-NAME=section comment
+NAME=comments in sections and bss
 FILE=bins/elf/analysis/x86-helloworld-gcc
 CMDS=<<EOF
 e asm.bytes=false
 pd 1 @ 0x080495a8
+echo -----
+e asm.bytes=true
+pd 3 @ section..bss
 EOF
 EXPECT=<<EOF
             ;-- section..dynamic:
@@ -3066,16 +3067,7 @@ EXPECT=<<EOF
             ;-- .dynamic:
             ;-- _DYNAMIC:
             0x080495a8      .dword 0x00000001                          ; [20] -rw- section size 232 named .dynamic
-EOF
-RUN
-
-NAME=bss section comment
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=<<EOF
-e asm.bytes=true
-pd 3 @ section..bss
-EOF
-EXPECT=<<EOF
+-----
             ;-- section..bss:
             ;-- .bss:
             ;-- completed.5979:
@@ -3089,115 +3081,6 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=il (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=il
-EXPECT=<<EOF
-library   
-----------
-libc.so.6
-EOF
-RUN
-
-NAME=ir (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=ir
-EXPECT=<<EOF
-     vaddr      paddr type           name              
--------------------------------------------------------
-0x08049690 0x00000690 R_386_GLOB_DAT __gmon_start__
-0x080496a0 0x000006a0 R_386_JMP_SLOT puts
-0x080496a4 0x000006a4 R_386_JMP_SLOT __gmon_start__
-0x080496a8 0x000006a8 R_386_JMP_SLOT __libc_start_main
-EOF
-RUN
-
-NAME=irq (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=irq
-EXPECT=<<EOF
-0x08049690  __gmon_start__
-0x080496a0  puts
-0x080496a4  __gmon_start__
-0x080496a8  __libc_start_main
-EOF
-RUN
-
-NAME=is (file x86)
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=is
-EXPECT=<<EOF
-nth      paddr      vaddr bind   type   size lib name                                   
-----------------------------------------------------------------------------------------
-  4 0x000004ac 0x080484ac GLOBAL OBJ       4     _IO_stdin_used
-  1 0x00000134 0x08048134 LOCAL  SECT      0     .interp
-  2 0x00000148 0x08048148 LOCAL  SECT      0     .note.ABI-tag
-  3 0x00000168 0x08048168 LOCAL  SECT      0     .note.gnu.build-id
-  4 0x0000018c 0x0804818c LOCAL  SECT      0     .gnu.hash
-  5 0x000001ac 0x080481ac LOCAL  SECT      0     .dynsym
-  6 0x000001fc 0x080481fc LOCAL  SECT      0     .dynstr
-  7 0x00000246 0x08048246 LOCAL  SECT      0     .gnu.version
-  8 0x00000250 0x08048250 LOCAL  SECT      0     .gnu.version_r
-  9 0x00000270 0x08048270 LOCAL  SECT      0     .rel.dyn
- 10 0x00000278 0x08048278 LOCAL  SECT      0     .rel.plt
- 11 0x00000290 0x08048290 LOCAL  SECT      0     .init
- 12 0x000002c0 0x080482c0 LOCAL  SECT      0     .plt
- 13 0x00000300 0x08048300 LOCAL  SECT      0     .text
- 14 0x00000494 0x08048494 LOCAL  SECT      0     .fini
- 15 0x000004a8 0x080484a8 LOCAL  SECT      0     .rodata
- 16 0x000004c0 0x080484c0 LOCAL  SECT      0     .eh_frame_hdr
- 17 0x000004ec 0x080484ec LOCAL  SECT      0     .eh_frame
- 18 0x0000059c 0x0804959c LOCAL  SECT      0     .init_array
- 19 0x000005a0 0x080495a0 LOCAL  SECT      0     .fini_array
- 20 0x000005a4 0x080495a4 LOCAL  SECT      0     .jcr
- 21 0x000005a8 0x080495a8 LOCAL  SECT      0     .dynamic
- 22 0x00000690 0x08049690 LOCAL  SECT      0     .got
- 23 0x00000694 0x08049694 LOCAL  SECT      0     .got.plt
- 24 0x000006ac 0x080496ac LOCAL  SECT      0     .data
- 25 ---------- 0x080496b4 LOCAL  SECT      0     .bss
- 26 ---------- 0x00000000 LOCAL  SECT      0     .comment
- 27 ---------- 0x00000000 LOCAL  FILE      0     init.c
- 28 ---------- 0x00000000 LOCAL  FILE      0     unknown_28
- 29 ---------- 0x00000000 LOCAL  FILE      0     crtstuff.c
- 30 0x000005a4 0x080495a4 LOCAL  OBJ       0     __JCR_LIST__
- 31 0x00000340 0x08048340 LOCAL  FUNC      0     deregister_tm_clones
- 32 0x00000370 0x08048370 LOCAL  FUNC      0     register_tm_clones
- 33 0x000003b0 0x080483b0 LOCAL  FUNC      0     __do_global_dtors_aux
- 34 ---------- 0x080496b4 LOCAL  OBJ       1     completed.5979
- 35 0x000005a0 0x080495a0 LOCAL  OBJ       0     __do_global_dtors_aux_fini_array_entry
- 36 0x000003d0 0x080483d0 LOCAL  FUNC      0     frame_dummy
- 37 0x0000059c 0x0804959c LOCAL  OBJ       0     __frame_dummy_init_array_entry
- 38 ---------- 0x00000000 LOCAL  FILE      0     hello.c
- 39 ---------- 0x00000000 LOCAL  FILE      0     crtstuff.c
- 40 0x00000598 0x08048598 LOCAL  OBJ       0     __FRAME_END__
- 41 0x000005a4 0x080495a4 LOCAL  OBJ       0     __JCR_END__
- 42 ---------- 0x00000000 LOCAL  FILE      0     unknown_42
- 43 0x000005a0 0x080495a0 LOCAL  NOTYPE    0     __init_array_end
- 44 0x000005a8 0x080495a8 LOCAL  OBJ       0     _DYNAMIC
- 45 0x0000059c 0x0804959c LOCAL  NOTYPE    0     __init_array_start
- 46 0x00000694 0x08049694 LOCAL  OBJ       0     _GLOBAL_OFFSET_TABLE_
- 47 0x00000490 0x08048490 GLOBAL FUNC      2     __libc_csu_fini
- 49 0x00000330 0x08048330 GLOBAL FUNC      4     __x86.get_pc_thunk.bx
- 50 0x000006ac 0x080496ac WEAK   NOTYPE    0     data_start
- 51 ---------- 0x080496b4 GLOBAL NOTYPE    0     _edata
- 52 0x00000494 0x08048494 GLOBAL FUNC      0     _fini
- 53 0x000006ac 0x080496ac GLOBAL NOTYPE    0     __data_start
- 56 0x000006b0 0x080496b0 GLOBAL OBJ       0     __dso_handle
- 57 0x000004ac 0x080484ac GLOBAL OBJ       4     _IO_stdin_used
- 59 0x00000420 0x08048420 GLOBAL FUNC     97     __libc_csu_init
- 60 ---------- 0x080496b8 GLOBAL NOTYPE    0     _end
- 61 0x00000300 0x08048300 GLOBAL FUNC      0     _start
- 62 0x000004a8 0x080484a8 GLOBAL OBJ       4     _fp_hw
- 63 ---------- 0x080496b4 GLOBAL NOTYPE    0     __bss_start
- 64 0x00000400 0x08048400 GLOBAL FUNC     28     main
- 66 ---------- 0x080496b4 GLOBAL OBJ       0     __TMC_END__
- 68 0x00000290 0x08048290 GLOBAL FUNC      0     _init
-  1 0x000002d0 0x080482d0 GLOBAL FUNC     16     imp.puts
-  2 0x000002e0 0x080482e0 WEAK   NOTYPE   16     imp.__gmon_start__
-  3 0x000002f0 0x080482f0 GLOBAL FUNC     16     imp.__libc_start_main
-EOF
-RUN
-
 NAME=iz (file x86)
 FILE=bins/elf/analysis/x86-helloworld-gcc
 CMDS=<<EOF
@@ -3281,7 +3164,39 @@ RUN
 
 NAME=i (file x86_64)
 FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=i~!hello-linux
+CMDS=<<EOF
+i~!hello-linux
+echo ---
+iA
+echo ---
+ie
+echo ---
+iH
+echo ---
+ii
+echo ---
+iI
+echo ---
+iS
+echo ---
+iSS
+echo ---
+il
+echo ---
+ir
+echo ---
+is
+echo ---
+iz
+echo ---
+izq
+echo ---
+izQ
+echo ---
+izzq~puts
+echo ---
+izzQ~puts
+EOF
 EXPECT=<<EOF
 fd       3
 size     0x1a36
@@ -3328,35 +3243,17 @@ canary   false
 PIE      false
 RELROCS  true
 NX       true
-EOF
-RUN
-
-NAME=iA (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=iA
-EXPECT=<<EOF
+---
     offset size arch bits machine                 big_endian 
 -------------------------------------------------------------
 0x00000000 6710 x86    64 AMD x86-64 architecture false
-EOF
-RUN
-
-NAME=ie (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=ie
-EXPECT=<<EOF
+---
      vaddr      paddr     hvaddr      haddr type    
 ----------------------------------------------------
 0x00400410 0x00000410 0x00400018 0x00000018 program
 0x004004d0 0x000004d0 0x006006e0 0x000006e0 init
 0x004004b0 0x000004b0 0x006006e8 0x000006e8 fini
-EOF
-RUN
-
-NAME=iH (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=iH
-EXPECT=<<EOF
+---
 elf:
   e_ident:
     bytes: "7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00"
@@ -3378,25 +3275,13 @@ elf:
   e_shnum: 30
   e_shstrndx: 27
 
-EOF
-RUN
-
-NAME=ii (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=ii
-EXPECT=<<EOF
+---
 nth      vaddr bind   type   lib name              
 ---------------------------------------------------
   1 0x004003e0 GLOBAL FUNC       puts
   2 0x004003f0 GLOBAL FUNC       __libc_start_main
   3 0x00400400 WEAK   NOTYPE     __gmon_start__
-EOF
-RUN
-
-NAME=iI (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=iI
-EXPECT=<<EOF
+---
 arch     x86
 cpu      N/A
 features N/A
@@ -3434,13 +3319,7 @@ canary   false
 PIE      false
 RELROCS  true
 NX       true
-EOF
-RUN
-
-NAME=iS (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=iS
-EXPECT=<<EOF
+---
      paddr  size      vaddr vsize align perm name               type       flags         
 -----------------------------------------------------------------------------------------
 0x00000000   0x0 ----------   0x0   0x0 ----                    NULL       
@@ -3473,13 +3352,7 @@ EXPECT=<<EOF
 0x00000921 0x108 ---------- 0x108   0x0 ---- .shstrtab          STRTAB     
 0x000011b0 0x648 ---------- 0x648   0x0 ---- .symtab            SYMTAB     
 0x000017f8 0x23e ---------- 0x23e   0x0 ---- .strtab            STRTAB     
-EOF
-RUN
-
-NAME=iSS (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=iSS
-EXPECT=<<EOF
+---
      paddr  size      vaddr vsize    align perm name         
 -------------------------------------------------------------
 0x00000040 0x1c0 0x00400040 0x1c0      0x8 -r-x PHDR
@@ -3491,55 +3364,18 @@ EXPECT=<<EOF
 0x000005d0  0x34 0x004005d0  0x34      0x4 -r-- GNU_EH_FRAME
 0x00000000   0x0 0x00000000   0x0      0x8 -rw- GNU_STACK
 0x00000000  0x40 0x00400000  0x40      0x0 -rw- ehdr
-EOF
-RUN
-
-NAME=il (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=il
-EXPECT=<<EOF
+---
 library   
 ----------
 libc.so.6
-EOF
-RUN
-
-NAME=ir (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=ir
-EXPECT=<<EOF
+---
      vaddr      paddr type               name              
 -----------------------------------------------------------
 0x006008c8 0x000008c8 R_X86_64_GLOB_DAT  __gmon_start__
 0x006008e8 0x000008e8 R_X86_64_JUMP_SLOT puts
 0x006008f0 0x000008f0 R_X86_64_JUMP_SLOT __libc_start_main
 0x006008f8 0x000008f8 R_X86_64_JUMP_SLOT __gmon_start__
-EOF
-RUN
-
-NAME=ir (file x86_64, ifunc)
-FILE=bins/elf/ifunc_rel64
-CMDS=ir
-EXPECT=<<EOF
-     vaddr      paddr type               name                            
--------------------------------------------------------------------------
-0x006b17d0 0x000b17d0 R_X86_64_IRELATIVE ifunc_416530 0x00416530 (ifunc)
-0x006b17d8 0x000b17d8 R_X86_64_IRELATIVE ifunc_4193a0 0x004193a0 (ifunc)
-0x006b17e0 0x000b17e0 R_X86_64_IRELATIVE ifunc_4199b0 0x004199b0 (ifunc)
-0x006b17e8 0x000b17e8 R_X86_64_IRELATIVE ifunc_418a50 0x00418a50 (ifunc)
-0x006b17f0 0x000b17f0 R_X86_64_IRELATIVE ifunc_418de0 0x00418de0 (ifunc)
-0x006b17f8 0x000b17f8 R_X86_64_IRELATIVE ifunc_419ad0 0x00419ad0 (ifunc)
-0x006b1800 0x000b1800 R_X86_64_IRELATIVE ifunc_4193f0 0x004193f0 (ifunc)
-0x006b1808 0x000b1808 R_X86_64_IRELATIVE ifunc_414300 0x00414300 (ifunc)
-0x006b1810 0x000b1810 R_X86_64_IRELATIVE ifunc_479800 0x00479800 (ifunc)
-0x006b1818 0x000b1818 R_X86_64_IRELATIVE ifunc_4140b0 0x004140b0 (ifunc)
-EOF
-RUN
-
-NAME=is (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=is
-EXPECT=<<EOF
+---
 nth      paddr      vaddr bind   type   size lib name                                   
 ----------------------------------------------------------------------------------------
   1 0x00000200 0x00400200 LOCAL  SECT      0     .interp
@@ -3605,50 +3441,39 @@ nth      paddr      vaddr bind   type   size lib name
   1 0x000003e0 0x004003e0 GLOBAL FUNC     16     imp.puts
   2 0x000003f0 0x004003f0 GLOBAL FUNC     16     imp.__libc_start_main
   3 0x00000400 0x00400400 WEAK   NOTYPE   16     imp.__gmon_start__
-EOF
-RUN
-
-NAME=iz (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=iz
-EXPECT=<<EOF
+---
      paddr      vaddr len size section type  string      
 ---------------------------------------------------------
 0x000005c4 0x004005c4  11   12 .rodata ascii Hello World
-EOF
-RUN
-
-NAME=izq (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=izq
-EXPECT=<<EOF
+---
 0x4005c4 12 11 Hello World
-EOF
-RUN
-
-NAME=izqq (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=izQ
-EXPECT=<<EOF
+---
 Hello World
-EOF
-RUN
-
-NAME=izzq (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=izzq~puts
-EXPECT=<<EOF
+---
 0x4002fa 5 4 puts
 ---------- 18 17 puts@@GLIBC_2.2.5
+---
+puts
+puts@@GLIBC_2.2.5
 EOF
 RUN
 
-NAME=izzqq (file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-CMDS=izzQ~puts
+NAME=ir (file x86_64, ifunc)
+FILE=bins/elf/ifunc_rel64
+CMDS=ir
 EXPECT=<<EOF
-puts
-puts@@GLIBC_2.2.5
+     vaddr      paddr type               name                            
+-------------------------------------------------------------------------
+0x006b17d0 0x000b17d0 R_X86_64_IRELATIVE ifunc_416530 0x00416530 (ifunc)
+0x006b17d8 0x000b17d8 R_X86_64_IRELATIVE ifunc_4193a0 0x004193a0 (ifunc)
+0x006b17e0 0x000b17e0 R_X86_64_IRELATIVE ifunc_4199b0 0x004199b0 (ifunc)
+0x006b17e8 0x000b17e8 R_X86_64_IRELATIVE ifunc_418a50 0x00418a50 (ifunc)
+0x006b17f0 0x000b17f0 R_X86_64_IRELATIVE ifunc_418de0 0x00418de0 (ifunc)
+0x006b17f8 0x000b17f8 R_X86_64_IRELATIVE ifunc_419ad0 0x00419ad0 (ifunc)
+0x006b1800 0x000b1800 R_X86_64_IRELATIVE ifunc_4193f0 0x004193f0 (ifunc)
+0x006b1808 0x000b1808 R_X86_64_IRELATIVE ifunc_414300 0x00414300 (ifunc)
+0x006b1810 0x000b1810 R_X86_64_IRELATIVE ifunc_479800 0x00479800 (ifunc)
+0x006b1818 0x000b1818 R_X86_64_IRELATIVE ifunc_4140b0 0x004140b0 (ifunc)
 EOF
 RUN
 
@@ -3666,29 +3491,33 @@ echo "" > /etc/shadow ; echo "" > /etc/passwd ; rm -Rf /
 EOF
 RUN
 
-NAME=izz (no rbin - file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-ARGS=-n
-CMDS=izz~puts
-EXPECT=<<EOF
-0x000002fa 0x000002fa   4    5         ascii   puts
-0x00001953 0x00001953  17   18         ascii   puts@@GLIBC_2.2.5
-EOF
-RUN
-
-NAME=izzj (no rbin - file x86_64)
+NAME=disable rzbin - file x86_64
 FILE=bins/elf/analysis/hello-linux-x86_64
 ARGS=-n
 CMDS=<<EOF
+izz~puts
+echo ---
 e bin.str.purge=all,!0x2fa,!0x1953
 izzj
+echo ---
+i~!file
 EOF
 EXPECT=<<EOF
+0x000002fa 0x000002fa   4    5         ascii   puts
+0x00001953 0x00001953  17   18         ascii   puts@@GLIBC_2.2.5
+---
 [{"vaddr":762,"paddr":762,"size":5,"length":4,"section":"","type":"ascii","string":"puts"},{"vaddr":6483,"paddr":6483,"size":18,"length":17,"section":"","type":"ascii","string":"puts@@GLIBC_2.2.5"}]
+---
+fd      3
+size    0x1a36
+humansz 6.6K
+mode    r-x
+iorw    false
+block   0x100
 EOF
 RUN
 
-NAME=izzj 2 (no rbin - file x86_64)
+NAME=izzj 2 (with rzbin - file x86_64)
 FILE=bins/elf/analysis/hello-linux-x86_64
 CMDS=<<EOF
 e bin.str.purge=all,!0x4002fa,!0x15b
@@ -3699,20 +3528,6 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=i (no rbin - file x86_64)
-FILE=bins/elf/analysis/hello-linux-x86_64
-ARGS=-n
-CMDS=i~!file
-EXPECT=<<EOF
-fd      3
-size    0x1a36
-humansz 6.6K
-mode    r-x
-iorw    false
-block   0x100
-EOF
-RUN
-
 NAME=iM command
 FILE=bins/elf/redpill
 CMDS=iM
@@ -3893,11 +3708,27 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=ik-relro
+NAME=ik
 FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=ik elf.relro
+CMDS=<<EOF
+ik elf.relro
+echo ---
+ik~elf_header
+echo ---
+obR
+ik *~?elf.relro
+EOF
 EXPECT=<<EOF
 no
+---
+elf_header.format=?[2]E[2]E[4]ExxxxN2N2N2N2N2N2 (elf_ident)ident (elf_type)type (elf_machine)machine (elf_obj_version)version entry phoff shoff flags ehsize phentsize phnum shentsize shnum shstrndx
+elf_header.intrp=/lib/ld-linux.so.2
+elf_header.intrp_addr=0x134
+elf_header.intrp_size=0x13
+elf_header.offset=0
+elf_header.size=0x34
+---
+1
 EOF
 RUN
 
@@ -3910,32 +3741,6 @@ EXPECT_ERR=<<EOF
 EOF
 RUN
 
-NAME=ik normal query
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=<<EOF
-obR
-ik *~?elf.relro
-EOF
-EXPECT=<<EOF
-1
-EOF
-RUN
-
-NAME=ik
-FILE=bins/elf/analysis/x86-helloworld-gcc
-CMDS=<<EOF
-ik~elf_header
-EOF
-EXPECT=<<EOF
-elf_header.format=?[2]E[2]E[4]ExxxxN2N2N2N2N2N2 (elf_ident)ident (elf_type)type (elf_machine)machine (elf_obj_version)version entry phoff shoff flags ehsize phentsize phnum shentsize shnum shstrndx
-elf_header.intrp=/lib/ld-linux.so.2
-elf_header.intrp_addr=0x134
-elf_header.intrp_size=0x13
-elf_header.offset=0
-elf_header.size=0x34
-EOF
-RUN
-
 NAME=i on freebsd elf
 FILE=bins/elf/analysis/hello-freebsd-x86_64
 CMDS=i~os
diff --git a/test/db/cmd/cmd_print b/test/db/cmd/cmd_print
index 41e994db5b..4649106d01 100644
--- a/test/db/cmd/cmd_print
+++ b/test/db/cmd/cmd_print
@@ -13,59 +13,25 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=p= 0xff 0x00
-FILE==
-BROKEN=1
-CMDS=<<EOF
-b 2
-wx 0xff
-p= 2@0
-EOF
-EXPECT=<<EOF
-         ___________________________________________________
-00 00ff | __________________________________________________|
-01 0000 ||
-EOF
-RUN
-
-NAME=p= 0xff 0x00
+NAME=p= various tests with malloc:// 
 FILE==
 CMDS=<<EOF
+e zoom.in=block
+p=p" 1 " 1 EN
+echo -------
 b 2
 wx 0xff
 e zoom.in=block
 p= 2 2@ 0
 EOF
 EXPECT=<<EOF
+0x00000000 000 0000 |#
+-------
 0x00000000 000 00ff |###################################################
 0x00000001 001 0000 |#
 EOF
 RUN
 
-NAME=p= - crash
-FILE==
-CMDS=<<EOF
-e zoom.in=block
-p=p" 1 " 1 EN
-EOF
-EXPECT=<<EOF
-0x00000000 000 0000 |#
-EOF
-RUN
-
-NAME=p=d
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=p=d @!10 @ 0
-EXPECT=<<EOF
-min:              0  0x0
-max:              127  0x7f
-unique (count):   6  0x6
-range (max-min):  127  0x7f
-size (of block):  10  0xa
-EOF
-RUN
-
 NAME=p=e 5
 FILE=bins/elf/arm1.bin
 CMDS=p=e 5@ 0
@@ -78,46 +44,128 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=p=e 5 0x100
+NAME=p= tests
 FILE=bins/elf/arm1.bin
 ARGS=-n
 CMDS=<<EOF
+p=d @!10 @ 0
+echo -------
+p=r
+echo -------
+p=r 0.73 0.06
+echo -------
+p=rj 0.73 0.06
+echo -------
+p=rq 0.73 0.06
+echo -------
+p=rl 0.73 0.06
+echo -------
+p=rt 0.73 0.06
+echo -------
+p=p 5@ 0
+echo -------
 e zoom.in=block
 p=e 5 0x100
+echo -------
+e zoom.in=block
+p=e 5 0x100 1
+echo -------
+e zoom.in=block
+p=p 5 0x100
+echo -------
+e zoom.in=block
+p=p 5 0x100 1
 EOF
 EXPECT=<<EOF
+min:              0  0x0
+max:              127  0x7f
+unique (count):   6  0x6
+range (max-min):  127  0x7f
+size (of block):  10  0xa
+-------
+0x00000000 Falling entropy edge
+-------
+0x00010a00 Rising entropy edge
+0x00017200 Rising entropy edge
+0x00017f00 Rising entropy edge
+0x0004a800 Rising entropy edge
+0x0005f000 Rising entropy edge
+0x00063d00 Falling entropy edge
+0x00064000 Falling entropy edge
+0x0006cd00 Falling entropy edge
+0x00070200 Rising entropy edge
+0x00073200 Falling entropy edge
+0x00074300 Falling entropy edge
+-------
+[{"addr":68096,"index":266,"edge_type":"rising entropy edge","entropy_value":0.730819},{"addr":94720,"index":370,"edge_type":"rising entropy edge","entropy_value":0.730736},{"addr":98048,"index":383,"edge_type":"rising entropy edge","entropy_value":0.733761},{"addr":305152,"index":1192,"edge_type":"rising entropy edge","entropy_value":0.730632},{"addr":389120,"index":1520,"edge_type":"rising entropy edge","entropy_value":0.757028},{"addr":408832,"index":1597,"edge_type":"falling entropy edge","entropy_value":0.042506},{"addr":409600,"index":1600,"edge_type":"falling entropy edge","entropy_value":0.000000},{"addr":445696,"index":1741,"edge_type":"falling entropy edge","entropy_value":0.058047},{"addr":459264,"index":1794,"edge_type":"rising entropy edge","entropy_value":0.760109},{"addr":471552,"index":1842,"edge_type":"falling entropy edge","entropy_value":0.000000},{"addr":475904,"index":1859,"edge_type":"falling entropy edge","entropy_value":0.024685}]
+-------
+0x00010a00
+0x00017200
+0x00017f00
+0x0004a800
+0x0005f000
+0x00063d00
+0x00064000
+0x0006cd00
+0x00070200
+0x00073200
+0x00074300
+-------
+0x00010a00 10a Rising entropy edge (0.730819)
+0x00017200 172 Rising entropy edge (0.730736)
+0x00017f00 17f Rising entropy edge (0.733761)
+0x0004a800 4a8 Rising entropy edge (0.730632)
+0x0005f000 5f0 Rising entropy edge (0.757028)
+0x00063d00 63d Falling entropy edge (0.042506)
+0x00064000 640 Falling entropy edge (0.000000)
+0x0006cd00 6cd Falling entropy edge (0.058047)
+0x00070200 702 Rising entropy edge (0.760109)
+0x00073200 732 Falling entropy edge (0.000000)
+0x00074300 743 Falling entropy edge (0.024685)
+-------
+   addr index edge_type            entropy_value 
+-------------------------------------------------
+0x10a00   266 rising entropy edge       0.730819
+0x17200   370 rising entropy edge       0.730736
+0x17f00   383 rising entropy edge       0.733761
+0x4a800  1192 rising entropy edge       0.730632
+0x5f000  1520 rising entropy edge       0.757028
+0x63d00  1597 falling entropy edge      0.042506
+0x64000  1600 falling entropy edge      0.000000
+0x6cd00  1741 falling entropy edge      0.058047
+0x70200  1794 rising entropy edge       0.760109
+0x73200  1842 falling entropy edge      0.000000
+0x74300  1859 falling entropy edge      0.024685
+-------
+0x00000000 000 0032 |##########
+0x0001bec1 001 0031 |#
+0x00037d82 002 0035 |###
+0x00053c43 003 0040 |###########
+0x0006fb04 004 0076 |########################
+-------
 0x00000000 000 007f |#########################
 0x00000033 001 006b |###
 0x00000066 002 007a |#########################
 0x00000099 003 006a |#####################
 0x000000cc 004 005f |###################
-EOF
-RUN
-
-NAME=p=e 5 0x100 1
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-e zoom.in=block
-p=e 5 0x100 1
-EOF
-EXPECT=<<EOF
+-------
 0x00000000 000 006b |###
 0x00000033 001 007a |#########################
 0x00000066 002 006a |#####################
 0x00000099 003 005f |###################
 0x000000cc 004 0059 |##################
-EOF
-RUN
-
-NAME=p=r
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-p=r
-EOF
-EXPECT=<<EOF
-0x00000000 Falling entropy edge
+-------
+0x00000000 000 0032 |#########
+0x00000033 001 0019 |#
+0x00000066 002 001e |#
+0x00000099 003 001e |##
+0x000000cc 004 0028 |########
+-------
+0x00000000 000 0019 |#
+0x00000033 001 001e |#
+0x00000066 002 001e |##
+0x00000099 003 0028 |#######
+0x000000cc 004 001e |######
 EOF
 RUN
 
@@ -135,148 +183,6 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=p=r 0.73 0.06
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-p=r 0.73 0.06
-EOF
-EXPECT=<<EOF
-0x00010a00 Rising entropy edge
-0x00017200 Rising entropy edge
-0x00017f00 Rising entropy edge
-0x0004a800 Rising entropy edge
-0x0005f000 Rising entropy edge
-0x00063d00 Falling entropy edge
-0x00064000 Falling entropy edge
-0x0006cd00 Falling entropy edge
-0x00070200 Rising entropy edge
-0x00073200 Falling entropy edge
-0x00074300 Falling entropy edge
-EOF
-RUN
-
-NAME=p=rj 0.73 0.06
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-p=rj 0.73 0.06
-EOF
-EXPECT=<<EOF
-[{"addr":68096,"index":266,"edge_type":"rising entropy edge","entropy_value":0.730819},{"addr":94720,"index":370,"edge_type":"rising entropy edge","entropy_value":0.730736},{"addr":98048,"index":383,"edge_type":"rising entropy edge","entropy_value":0.733761},{"addr":305152,"index":1192,"edge_type":"rising entropy edge","entropy_value":0.730632},{"addr":389120,"index":1520,"edge_type":"rising entropy edge","entropy_value":0.757028},{"addr":408832,"index":1597,"edge_type":"falling entropy edge","entropy_value":0.042506},{"addr":409600,"index":1600,"edge_type":"falling entropy edge","entropy_value":0.000000},{"addr":445696,"index":1741,"edge_type":"falling entropy edge","entropy_value":0.058047},{"addr":459264,"index":1794,"edge_type":"rising entropy edge","entropy_value":0.760109},{"addr":471552,"index":1842,"edge_type":"falling entropy edge","entropy_value":0.000000},{"addr":475904,"index":1859,"edge_type":"falling entropy edge","entropy_value":0.024685}]
-EOF
-RUN
-
-NAME=p=rq 0.73 0.06
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-p=rq 0.73 0.06
-EOF
-EXPECT=<<EOF
-0x00010a00
-0x00017200
-0x00017f00
-0x0004a800
-0x0005f000
-0x00063d00
-0x00064000
-0x0006cd00
-0x00070200
-0x00073200
-0x00074300
-EOF
-RUN
-
-NAME=p=rl 0.73 0.06
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-p=rl 0.73 0.06
-EOF
-EXPECT=<<EOF
-0x00010a00 10a Rising entropy edge (0.730819)
-0x00017200 172 Rising entropy edge (0.730736)
-0x00017f00 17f Rising entropy edge (0.733761)
-0x0004a800 4a8 Rising entropy edge (0.730632)
-0x0005f000 5f0 Rising entropy edge (0.757028)
-0x00063d00 63d Falling entropy edge (0.042506)
-0x00064000 640 Falling entropy edge (0.000000)
-0x0006cd00 6cd Falling entropy edge (0.058047)
-0x00070200 702 Rising entropy edge (0.760109)
-0x00073200 732 Falling entropy edge (0.000000)
-0x00074300 743 Falling entropy edge (0.024685)
-EOF
-RUN
-
-NAME=p=rt 0.73 0.06
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-p=rt 0.73 0.06
-EOF
-EXPECT=<<EOF
-   addr index edge_type            entropy_value 
--------------------------------------------------
-0x10a00   266 rising entropy edge       0.730819
-0x17200   370 rising entropy edge       0.730736
-0x17f00   383 rising entropy edge       0.733761
-0x4a800  1192 rising entropy edge       0.730632
-0x5f000  1520 rising entropy edge       0.757028
-0x63d00  1597 falling entropy edge      0.042506
-0x64000  1600 falling entropy edge      0.000000
-0x6cd00  1741 falling entropy edge      0.058047
-0x70200  1794 rising entropy edge       0.760109
-0x73200  1842 falling entropy edge      0.000000
-0x74300  1859 falling entropy edge      0.024685
-EOF
-RUN
-
-NAME=p=p 5
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=p=p 5@ 0
-EXPECT=<<EOF
-0x00000000 000 0032 |##########
-0x0001bec1 001 0031 |#
-0x00037d82 002 0035 |###
-0x00053c43 003 0040 |###########
-0x0006fb04 004 0076 |########################
-EOF
-RUN
-
-NAME=p=p 5 0x100
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-e zoom.in=block
-p=p 5 0x100
-EOF
-EXPECT=<<EOF
-0x00000000 000 0032 |#########
-0x00000033 001 0019 |#
-0x00000066 002 001e |#
-0x00000099 003 001e |##
-0x000000cc 004 0028 |########
-EOF
-RUN
-
-NAME=p=p 5 0x100 1
-FILE=bins/elf/arm1.bin
-ARGS=-n
-CMDS=<<EOF
-e zoom.in=block
-p=p 5 0x100 1
-EOF
-EXPECT=<<EOF
-0x00000000 000 0019 |#
-0x00000033 001 001e |#
-0x00000066 002 001e |##
-0x00000099 003 0028 |#######
-0x000000cc 004 001e |######
-EOF
-RUN
-
 NAME=p8 10
 FILE=malloc://1024
 CMDS=wx 90909090909090909090 ; p8 10
@@ -337,21 +243,12 @@ CMDS=<<EOF
 e asm.arch=x86
 e asm.bits=64
 pi -5 @ 0x0040050f
-EOF
-EXPECT=<<EOF
-pop rbp
-jmp sym.register_tm_clones
-push rbp
-mov rbp, rsp
-mov edi, str.Hello_World
-EOF
-RUN
-
-NAME=pi -5 @ 0x0040050f (analysis)
-FILE=bins/elf/analysis/main
-CMDS=<<EOF
-e asm.arch=x86
-e asm.bits=64
+echo -------
+pdj -3 @ 0x0040050f
+echo -------
+s 0x0040050f
+pi -5
+echo -------
 aaa
 pi -5 @ 0x0040050f
 EOF
@@ -361,30 +258,15 @@ jmp sym.register_tm_clones
 push rbp
 mov rbp, rsp
 mov edi, str.Hello_World
-EOF
-RUN
-
-NAME=pdj -5 @ 0x0040050f
-FILE=bins/elf/analysis/main
-CMDS=<<EOF
-e asm.arch=x86
-e asm.bits=64
-pdj -3 @ 0x0040050f
-EOF
-EXPECT=<<EOF
+-------
 [{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
-EOF
-RUN
-
-NAME=pi -5
-FILE=bins/elf/analysis/main
-CMDS=<<EOF
-e asm.arch=x86
-e asm.bits=64
-s 0x0040050f
-pi -5
-EOF
-EXPECT=<<EOF
+-------
+pop rbp
+jmp sym.register_tm_clones
+push rbp
+mov rbp, rsp
+mov edi, str.Hello_World
+-------
 pop rbp
 jmp sym.register_tm_clones
 push rbp
@@ -645,23 +527,14 @@ e asm.arch=x86
 e asm.bits=64
 p8 1 @b:32
 e asm.bits
-EOF
-EXPECT=<<EOF
-00
-64
-EOF
-RUN
-
-NAME=tmpbits
-FILE==
-CMDS=<<EOF
-e asm.arch=x86
 e asm.bits=32
 p8 1 @b:64
 e asm.bits
 EOF
 EXPECT=<<EOF
 00
+64
+00
 32
 EOF
 RUN
@@ -675,23 +548,14 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=/m lzma
+NAME=pm lzma
 FILE=bins/other/hello-world.lzma
 CMDS=<<EOF
 pm
-EOF
-EXPECT=<<EOF
-0x00000000 LZMA BE compressed data dictionary size: 32768 bytes,
-EOF
-EXPECT_ERR=
-RUN
-
-NAME=/pmj lzma
-FILE=bins/other/hello-world.lzma
-CMDS=<<EOF
 pmj
 EOF
 EXPECT=<<EOF
+0x00000000 LZMA BE compressed data dictionary size: 32768 bytes,
 [{"address":0,"magic":"LZMA BE compressed data dictionary size: 32768 bytes,"}]
 EOF
 EXPECT_ERR=
@@ -708,17 +572,12 @@ RUN
 NAME=pm elf/main
 FILE=bins/elf/analysis/main
 ARGS=-n
-CMDS=pm
+CMDS=<<EOF
+pm
+pmj
+EOF
 EXPECT=<<EOF
 0x00000000 ELF 64-bit LSB executable, x86-64, version 1
-EOF
-RUN
-
-NAME=pmj elf/main
-FILE=bins/elf/analysis/main
-ARGS=-n
-CMDS=pmj
-EXPECT=<<EOF
 [{"address":0,"magic":"ELF 64-bit LSB executable, x86-64, version 1"}]
 EOF
 RUN
@@ -774,12 +633,15 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=pib from beginning of bb
+NAME=pib from beginning of bb & inside bb
 FILE=bins/elf/analysis/x64-loop
 CMDS=<<EOF
 s main
 af
 pib
+echo -------
+so 2
+pib
 EOF
 EXPECT=<<EOF
 push rbp
@@ -789,18 +651,7 @@ mov dword [var_1ch], edi
 mov qword [var_28h], rsi
 mov dword [var_ch], 0x00
 jmp 0x400523
-EOF
-RUN
-
-NAME=pib inside bb
-FILE=bins/elf/analysis/x64-loop
-CMDS=<<EOF
-s main
-af
-so 2
-pib
-EOF
-EXPECT=<<EOF
+-------
 sub rsp, 0x20
 mov dword [var_1ch], edi
 mov qword [var_28h], rsi
@@ -832,31 +683,20 @@ nop
 EOF
 RUN
 
-NAME=psW 32 utf32le
+NAME=psW 32 utf32le & psM 32 utf32be
 FILE=bins/elf/crackme0x00b
-CMDS=psW @ obj.pass.1964
+CMDS=<<EOF
+psW @ obj.pass.1964
+echo --------
+psM @ 0x0804a03d
+EOF
 EXPECT=<<EOF
 w0wgreat
-EOF
-RUN
-
-NAME=psM 32 utf32be
-FILE=bins/elf/crackme0x00b
-CMDS=psM @ 0x0804a03d
-EXPECT=<<EOF
+--------
 w0wgreat
 EOF
 RUN
 
-NAME=ps leading zeros
-BROKEN=1
-FILE=bins/elf/crackme0x00b
-CMDS=ps @ 0x0804a03e
-EXPECT=<<EOF
-w
-EOF
-RUN
-
 NAME=io.unalloc, io.unalloc.ch and prc
 FILE=bins/elf/analysis/tiny.elf
 CMDS=<<EOF