diff --git a/tests/test_mdiarea.py b/tests/test_mdiarea.py
index 3dba338..4481e55 100644
--- a/tests/test_mdiarea.py
+++ b/tests/test_mdiarea.py
@@ -14,17 +14,17 @@ from PyQt5.QtWidgets import QApplication, QMdiArea
 class TestViewUnit(unittest.TestCase):
 
     def setUp(self) -> None:
-        print("setup")
+#        print("setup")
         self.app = QApplication(sys.argv)
         self.mw = MainWindow(add_examples=True)
         self.mw.show()
 
 
     def tearDown(self) -> None:
-        print("teardown")
+#        print("teardown")
         self.mw.rst.wait_for_stop()
         self.app.quit()
-        print("app quit called")
+#        print("app quit called")
         del self.mw
         del self.app
 
@@ -35,11 +35,17 @@ class TestViewUnit(unittest.TestCase):
         mdi.enable_subwindow_view = mock.MagicMock()
         mdi.cascadeSubWindows = mock.MagicMock()
         mdi.menu.checkboxes["Multiple windows"].setChecked(False)
-        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == False
+
+        self.assertFalse(
+            mdi.menu.checkboxes["Multiple windows"].isChecked()
+        )
 
         mdi.on_cascade()
 
-        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == True
+        self.assertTrue(
+            mdi.menu.checkboxes["Multiple windows"].isChecked()
+        )
+
         mdi.enable_subwindow_view.assert_called_once()
         mdi.cascadeSubWindows.assert_called_once()
 
@@ -50,11 +56,17 @@ class TestViewUnit(unittest.TestCase):
         mdi.enable_subwindow_view = mock.MagicMock()
         mdi.tileSubWindows = mock.MagicMock()
         mdi.menu.checkboxes["Multiple windows"].setChecked(False)
-        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == False
+
+        self.assertFalse(
+            mdi.menu.checkboxes["Multiple windows"].isChecked()
+        )
 
         mdi.on_tile()
 
-        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == True
+        self.assertTrue(
+            mdi.menu.checkboxes["Multiple windows"].isChecked()
+        )
+
         mdi.enable_subwindow_view.assert_called_once()
         mdi.tileSubWindows.assert_called_once()
 
@@ -64,14 +76,20 @@ class TestViewUnit(unittest.TestCase):
         mdi.enable_subwindow_view = mock.MagicMock()
         mdi.closeInactiveSubWindows = mock.MagicMock()
         active = mdi.activeSubWindow()
-        assert  mdi.activeSubWindow() == None
+
+        self.assertIsNone(
+            mdi.activeSubWindow()
+        )
 
         sine_item = self.mw.lst.lst.get("sine")
         sub = MDISubPlot("sine", sine_item.value)
         mdi.addSubWindow(sub)
-        mdi.setActiveSubWindow(MDISubWindow("sine"))
+        mdi.setActiveSubWindow(sub)
 
-        # assert  mdi.activeSubWindow() != None
+        #TODO: check this
+#        self.assertIsNotNone(
+#            mdi.activeSubWindow()
+#        )
 
         mdi.enable_single_window_mode()
 
@@ -110,17 +128,24 @@ class TestViewUnit(unittest.TestCase):
 
     def test_add(self):
         mdi =self.mw.mdi
+
         sine_item = self.mw.lst.lst.get("sine")
         sub = MDISubPlot("sine", sine_item.value)
         mdi.add_multiple = mock.MagicMock()
         mdi.add_single = mock.MagicMock()
-        assert mdi.menu.checkboxes["Single window"].isChecked() == False
+
+        self.assertFalse(
+            mdi.menu.checkboxes["Single window"].isChecked()
+        )
 
         mdi.add(sub)
         mdi.add_multiple.assert_called_once_with(sub)
 
         mdi.menu.checkboxes['Single window'].setChecked(True)
-        assert mdi.menu.checkboxes["Single window"].isChecked() == True
+
+        self.assertTrue(
+            mdi.menu.checkboxes["Single window"].isChecked()
+        )
 
         mdi.add(sub)
         mdi.add_single.assert_called_once_with(sub)
@@ -171,11 +196,15 @@ class TestViewUnit(unittest.TestCase):
 
         ret = mdi.findSubWindow('sine')
 
-        assert ret == sub
+        self.assertEqual(
+            ret, sub
+        )
 
         ret = mdi.findSubWindow('cosine')
 
-        assert ret == None
+        self.assertIsNone(
+            ret
+        )
 
 
     def test_closeInactiveSubWindows(self):
@@ -191,9 +220,12 @@ class TestViewUnit(unittest.TestCase):
 
         mdi.closeInactiveSubWindows()
 
-
         active = mdi.activeSubWindow()
-        assert active == cosine_sub
+
+        self.assertEqual(
+            active, cosine_sub
+        )
+
         for sub in mdi.subWindowList():
             if sub != active:
                 sub.close.assert_called_once()