diff --git a/test/acceptance/test_cwe190.py b/test/acceptance/test_cwe190.py
index d49bcb9..4668d65 100644
--- a/test/acceptance/test_cwe190.py
+++ b/test/acceptance/test_cwe190.py
@@ -11,25 +11,25 @@ class TestCwe190(unittest.TestCase):
     def test_cwe190_01_arm(self):
         expect_res = 3
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe190_01_x86(self):
         expect_res = 3
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe190_01_x64(self):
         expect_res = 3
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe190_01_mips(self):
         expect_res = 3
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe190_01_ppc(self):
         expect_res = 3
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe215.py b/test/acceptance/test_cwe215.py
index 37e5c9c..748f1df 100644
--- a/test/acceptance/test_cwe215.py
+++ b/test/acceptance/test_cwe215.py
@@ -12,24 +12,24 @@ class TestCwe215(unittest.TestCase):
     def test_cwe215_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.filename, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe215_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.filename, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe215_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.filename, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe215_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.filename, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe215_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.filename, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe243.py b/test/acceptance/test_cwe243.py
index e5a5483..f862559 100644
--- a/test/acceptance/test_cwe243.py
+++ b/test/acceptance/test_cwe243.py
@@ -11,52 +11,52 @@ class TestCwe243(unittest.TestCase):
     def test_cwe243_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe243_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe243_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe243_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe243_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe243_02_arm(self):
         expect_res = 0
         res = cwe_checker_testlib.execute_and_check_occurence(self.target + "_clean", self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Investigate and fix this issue")
     def test_cwe243_02_x86(self):
         expect_res = 0
         res = cwe_checker_testlib.execute_and_check_occurence(self.target + "_clean", self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe243_02_x64(self):
         expect_res = 0
         res = cwe_checker_testlib.execute_and_check_occurence(self.target + "_clean", self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe243_02_ppc(self):
         expect_res = 0
         res = cwe_checker_testlib.execute_and_check_occurence(self.target + "_clean", self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe476_02_mips(self):
         expect_res = 0
         res = cwe_checker_testlib.execute_and_check_occurence(self.target + "_clean", self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe248.py b/test/acceptance/test_cwe248.py
index 4dc0593..0a50d45 100644
--- a/test/acceptance/test_cwe248.py
+++ b/test/acceptance/test_cwe248.py
@@ -11,26 +11,26 @@ class TestCwe248(unittest.TestCase):
     def test_cwe248_01_arm(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Fix CPP compilation issue for x86")
     def test_cwe248_01_x86(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe248_01_x64(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe248_01_mips(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe248_01_ppc(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe332.py b/test/acceptance/test_cwe332.py
index ea42350..86914e1 100644
--- a/test/acceptance/test_cwe332.py
+++ b/test/acceptance/test_cwe332.py
@@ -11,25 +11,25 @@ class TestCwe332(unittest.TestCase):
     def test_cwe332_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe332_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe332_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe332_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe332_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe367.py b/test/acceptance/test_cwe367.py
index d449727..b3f08de 100644
--- a/test/acceptance/test_cwe367.py
+++ b/test/acceptance/test_cwe367.py
@@ -11,25 +11,25 @@ class TestCwe367(unittest.TestCase):
     def test_cwe367_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe367_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe367_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe367_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe367_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe415.py b/test/acceptance/test_cwe415.py
index 660edb5..1e7e3d7 100644
--- a/test/acceptance/test_cwe415.py
+++ b/test/acceptance/test_cwe415.py
@@ -11,25 +11,25 @@ class TestCwe415(unittest.TestCase):
     def test_cwe415_01_arm(self):
         expect_res = 5
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe415_01_x86(self):
         expect_res = 5
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe415_01_x64(self):
         expect_res = 9
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe415_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe415_01_ppc(self):
         expect_res = 3
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe416.py b/test/acceptance/test_cwe416.py
index 2e2d7d7..496a51b 100644
--- a/test/acceptance/test_cwe416.py
+++ b/test/acceptance/test_cwe416.py
@@ -11,25 +11,25 @@ class TestCwe416(unittest.TestCase):
     def test_cwe416_01_arm(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe416_01_x86(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe416_01_x64(self):
         expect_res = 4
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe416_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe416_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_emulation_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe426.py b/test/acceptance/test_cwe426.py
index 234e259..00fdc99 100644
--- a/test/acceptance/test_cwe426.py
+++ b/test/acceptance/test_cwe426.py
@@ -11,26 +11,26 @@ class TestCwe426(unittest.TestCase):
     def test_cwe426_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("FIXME")
     def test_cwe426_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe426_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe426_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe426_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe457.py b/test/acceptance/test_cwe457.py
index 6848f0c..2e13dd8 100644
--- a/test/acceptance/test_cwe457.py
+++ b/test/acceptance/test_cwe457.py
@@ -12,28 +12,28 @@ class TestCwe457(unittest.TestCase):
     def test_cwe457_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("FIXME")
     def test_cwe457_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("FIXME")
     def test_cwe457_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe457_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("FIXME")
     def test_cwe457_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe467.py b/test/acceptance/test_cwe467.py
index b577216..0bd94b1 100644
--- a/test/acceptance/test_cwe467.py
+++ b/test/acceptance/test_cwe467.py
@@ -11,26 +11,26 @@ class TestCwe467(unittest.TestCase):
     def test_cwe467_01_arm(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("FIXME")
     def test_cwe467_01_x86(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe467_01_x64(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe467_01_mips(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe467_01_ppc(self):
         expect_res = 2
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe476.py b/test/acceptance/test_cwe476.py
index 1a3b983..c898977 100644
--- a/test/acceptance/test_cwe476.py
+++ b/test/acceptance/test_cwe476.py
@@ -11,26 +11,26 @@ class TestCwe476(unittest.TestCase):
     def test_cwe476_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe476_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe476_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe476_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Fix issue in CWE476 implementation to support PPC")
     def test_cwe476_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe676.py b/test/acceptance/test_cwe676.py
index c16a05b..2876907 100644
--- a/test/acceptance/test_cwe676.py
+++ b/test/acceptance/test_cwe676.py
@@ -11,25 +11,25 @@ class TestCwe676(unittest.TestCase):
     def test_cwe676_01_arm(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'arm', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe676_01_x86(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x86', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe676_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     @unittest.skip("Depends on proper MIPS support in BAP")
     def test_cwe676_01_mips(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'mips', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
 
     def test_cwe676_01_ppc(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'ppc', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)
diff --git a/test/acceptance/test_cwe782.py b/test/acceptance/test_cwe782.py
index c87239e..2d8c490 100644
--- a/test/acceptance/test_cwe782.py
+++ b/test/acceptance/test_cwe782.py
@@ -11,4 +11,4 @@ class TestCwe782(unittest.TestCase):
     def test_cwe782_01_x64(self):
         expect_res = 1
         res = cwe_checker_testlib.execute_and_check_occurence(self.target, self.target, 'x64', self.string)
-        assert res == expect_res
+        self.assertEqual(res, expect_res)