diff --git a/.github/workflows/CITest.yml b/.github/workflows/CITest.yml
index 39a1654f5..75c8a8575 100644
--- a/.github/workflows/CITest.yml
+++ b/.github/workflows/CITest.yml
@@ -41,8 +41,3 @@ jobs:
         cd suite/cstest && ./build_cstest.sh;
         python cstest_report.py -D -t build/cstest -d ../MC;
         python cstest_report.py -D -t build/cstest -f issues.cs; cd ..;
-        
-    - name: fuzz
-      shell: 'script -q -e -c "bash {0}"'
-      run: |
-        python ./fuzz.py
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e9f057cbd..9a72f29e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@ xcode/Capstone.xcodeproj/xcuserdata
 xcode/Capstone.xcodeproj/project.xcworkspace/xcuserdata
 
 # suite/
+corpus-libFuzzer-capstone_fuzz_disasmnext-latest.zip
 test_arm_regression
 test_arm_regression.o
 fuzz_harness
@@ -119,7 +120,8 @@ fuzz_bindisasm
 fuzz_disasm
 fuzz_decode_platform
 capstone_get_setup
-
+suite/fuzz/
+suite/cstest/cmocka/
 
 *.s
 
diff --git a/bindings/python/test_evm.py b/bindings/python/test_evm.py
index 81f646423..8922fe0e3 100755
--- a/bindings/python/test_evm.py
+++ b/bindings/python/test_evm.py
@@ -4,26 +4,47 @@
 
 from __future__ import print_function
 from capstone import *
+import sys
+
 from xprint import to_hex
 
-CODE = "\x60\x61\x50"
-cs = Cs(CS_ARCH_EVM, 0)
-cs.detail = True
+_python3 = sys.version_info.major == 3
 
-print("Platform: EVM")
-print("Code: %s" %to_hex(CODE))
-print("Disasm:")
 
-for i in cs.disasm(CODE, 0x80001000):
-    print("0x%x:\t%s\t%s" %(i.address, i.mnemonic, i.op_str))
-    if i.pop > 0:
-        print("\tPop:     %u" %i.pop)
-    if i.push > 0:
-        print("\tPush:    %u" %i.push)
-    if i.fee > 0:
-        print("\tGas fee: %u" %i.fee)
-    if len(i.groups) > 0:
-        print("\tGroups: ", end=''),
-        for m in i.groups:
-            print("%s " % i.group_name(m), end=''),
-        print()
+EVM_CODE = b"\x60\x61\x50"
+
+all_tests = (
+        (CS_ARCH_EVM, 0, EVM_CODE, "EVM"),
+)
+
+
+def test_class():
+    address = 0x80001000
+    for (arch, mode, code, comment) in all_tests:
+        print("Platform: %s" % comment)
+        print("Code: %s " % to_hex(code))
+        print("Disasm:")
+
+        try:
+            md = Cs(arch, mode)
+            md.detail = True
+            for i in md.disasm(code, address):
+                print("0x%x:\t%s\t%s" %(i.address, i.mnemonic, i.op_str))
+                if i.pop > 0:
+                    print("\tPop:     %u" %i.pop)
+                if i.push > 0:
+                    print("\tPush:    %u" %i.push)
+                if i.fee > 0:
+                    print("\tGas fee: %u" %i.fee)
+                if len(i.groups) > 0:
+                    print("\tGroups: ", end=''),
+                    for m in i.groups:
+                        print("%s " % i.group_name(m), end=''),
+                    print()
+
+        except CsError as e:
+            print("ERROR: %s" % e.__str__())
+
+
+if __name__ == '__main__':
+    test_class()
diff --git a/suite/cstest/build_cstest.sh b/suite/cstest/build_cstest.sh
old mode 100644
new mode 100755
diff --git a/suite/cstest/cstest_report.py b/suite/cstest/cstest_report.py
index a4883eef5..c3046cc16 100755
--- a/suite/cstest/cstest_report.py
+++ b/suite/cstest/cstest_report.py
@@ -7,6 +7,8 @@ from subprocess import Popen, PIPE
 from pprint import pprint as ppr
 import os
 
+_python3 = sys.version_info.major == 3
+
 
 def Usage(s):
 	print('Usage: {} -t <cstest_path> [-f <file_name.cs>] [-d <directory>]'.format(s))
@@ -19,8 +21,11 @@ def get_report_file(toolpath, filepath, getDetails, cmt_out):
 
 #	stdout
 	failed_tests = []
-#	print('---> stdout\n', stdout)
-#	print('---> stderr\n', stderr)
+	if _python3:
+		stdout = bytes.decode(stdout)
+		stderr = bytes.decode(stderr)
+	# print('---> stdout\n', stdout)
+	# print('---> stderr\n', stderr)
 	matches = re.finditer(r'\[\s+RUN\s+\]\s+(.*)\n\[\s+FAILED\s+\]', stdout)
 	for match in matches:
 		failed_tests.append(match.group(1))
@@ -58,7 +63,7 @@ def get_report_file(toolpath, filepath, getDetails, cmt_out):
 				rm_proc = Popen(tmp_cmd2, stdout=PIPE, stderr=PIPE)
 				rm_proc.communicate()
 
-		return 0;
+		return 0
 	return 1
 
 def get_report_folder(toolpath, folderpath, details, cmt_out):
diff --git a/suite/test_all.sh b/suite/test_all.sh
index 443f442de..1c68bc862 100755
--- a/suite/test_all.sh
+++ b/suite/test_all.sh
@@ -5,5 +5,5 @@
 
 # syntax: test_all.sh <name>
 
-./test_archs.py > /tmp/$1_arch
+# ./test_archs.py > /tmp/$1_arch
 ./test_c.sh $1_c
diff --git a/suite/test_c.sh b/suite/test_c.sh
index 13f2a9cc8..a7f200899 100755
--- a/suite/test_c.sh
+++ b/suite/test_c.sh
@@ -3,16 +3,24 @@
 # Run all the Python tests, and send the output that to a file to be compared later
 # This is useful when we want to verify if a commit (wrongly) changes the disassemble result.
 
-../tests/test > /tmp/$1
-../tests/test_detail >> /tmp/$1
-../tests/test_skipdata >> /tmp/$1
-../tests/test_iter >> /tmp/$1
-../tests/test_arm >> /tmp/$1
-../tests/test_arm64 >> /tmp/$1
-../tests/test_mips >> /tmp/$1
-../tests/test_ppc >> /tmp/$1
-../tests/test_sparc >> /tmp/$1
-../tests/test_x86 >> /tmp/$1
-../tests/test_systemz >> /tmp/$1
-../tests/test_xcore >> /tmp/$1
-../tests/test_riscv >> /tmp/$1
+../tests/test_arm > /tmp/$1
+../tests/test_arm64 > /tmp/$1
+../tests/test_basic > /tmp/$1
+../tests/test_bpf > /tmp/$1
+../tests/test_customized_mnem > /tmp/$1
+../tests/test_detail > /tmp/$1
+../tests/test_evm > /tmp/$1
+../tests/test_iter > /tmp/$1
+../tests/test_m680x > /tmp/$1
+../tests/test_m68k > /tmp/$1
+../tests/test_mips > /tmp/$1
+../tests/test_mos65xx > /tmp/$1
+../tests/test_ppc > /tmp/$1
+../tests/test_skipdata > /tmp/$1
+../tests/test_sparc > /tmp/$1
+../tests/test_systemz > /tmp/$1
+../tests/test_tms320c64x > /tmp/$1
+../tests/test_wasm > /tmp/$1
+../tests/test_winkernel > /tmp/$1
+../tests/test_x86 > /tmp/$1
+../tests/test_xcore > /tmp/$1
\ No newline at end of file