diff --git a/src/tests/mock/pybitmessage/baseclass/addressbook.py b/src/tests/mock/pybitmessage/baseclass/addressbook.py
index f6e3dde2..73d36498 100644
--- a/src/tests/mock/pybitmessage/baseclass/addressbook.py
+++ b/src/tests/mock/pybitmessage/baseclass/addressbook.py
@@ -60,9 +60,9 @@ class AddressBook(Screen):
         if self.ids.scroll_y.scroll_y <= -0.0 and self.has_refreshed:
             self.ids.scroll_y.scroll_y = 0.06
             exist_addresses = len(self.ids.ml.children)
-            
+
     @staticmethod
-    def refreshs(*args):
+    def refreshes(*args):
         """Refresh the Widget"""
         # state.navinstance.ids.sc11.ids.ml.clear_widgets()
         # state.navinstance.ids.sc11.loadAddresslist(None, 'All', '')
diff --git a/src/tests/mock/pybitmessage/baseclass/draft.py b/src/tests/mock/pybitmessage/baseclass/draft.py
index 8de9777f..1c037722 100644
--- a/src/tests/mock/pybitmessage/baseclass/draft.py
+++ b/src/tests/mock/pybitmessage/baseclass/draft.py
@@ -15,7 +15,6 @@ from pybitmessage.baseclass.common import (
     showLimitedCnt, toast, ThemeClsColor,
     SwipeToDeleteItem, ShowTimeHistoy
 )
-# from pybitmessage.baseclass.maildetail import MailDetail
 
 
 class Draft(Screen):
diff --git a/src/tests/mock/pybitmessage/baseclass/inbox.py b/src/tests/mock/pybitmessage/baseclass/inbox.py
index cd3a32e6..bbfe5abd 100644
--- a/src/tests/mock/pybitmessage/baseclass/inbox.py
+++ b/src/tests/mock/pybitmessage/baseclass/inbox.py
@@ -25,7 +25,7 @@ class Inbox(Screen):
 
     @staticmethod
     def set_defaultAddress():
-        """This method set's default address"""        
+        """This method set's default address"""
         if state.association == "":
             if state.kivyapp.variable_1:
                 state.association = state.kivyapp.variable_1[0]
diff --git a/src/tests/mock/pybitmessage/baseclass/login.py b/src/tests/mock/pybitmessage/baseclass/login.py
index 8f1619be..d082b739 100644
--- a/src/tests/mock/pybitmessage/baseclass/login.py
+++ b/src/tests/mock/pybitmessage/baseclass/login.py
@@ -1,16 +1,14 @@
 from pybitmessage import queues
-
 from pybitmessage.bmconfigparser import BMConfigParser
+from pybitmessage import state
+from pybitmessage.baseclass.common import toast
+
 from kivy.clock import Clock
 from kivy.properties import StringProperty, BooleanProperty
 from kivy.uix.boxlayout import BoxLayout
 from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
 from kivy.uix.screenmanager import Screen
 
-from pybitmessage import state
-
-from pybitmessage.baseclass.common import toast
-
 
 class Login(Screen):
     """Login Screeen class for kivy Ui"""
diff --git a/src/tests/mock/pybitmessage/baseclass/myaddress.py b/src/tests/mock/pybitmessage/baseclass/myaddress.py
index 77709346..d519fe32 100644
--- a/src/tests/mock/pybitmessage/baseclass/myaddress.py
+++ b/src/tests/mock/pybitmessage/baseclass/myaddress.py
@@ -2,7 +2,6 @@ from pybitmessage.get_platform import platform
 from functools import partial
 from pybitmessage.bmconfigparser import BMConfigParser
 from kivy.clock import Clock
-# from kivy.metrics import dp
 from kivy.properties import (
     ListProperty,
     StringProperty
diff --git a/src/tests/mock/pybitmessage/baseclass/payment.py b/src/tests/mock/pybitmessage/baseclass/payment.py
index 411cdde2..95f0a97e 100644
--- a/src/tests/mock/pybitmessage/baseclass/payment.py
+++ b/src/tests/mock/pybitmessage/baseclass/payment.py
@@ -11,12 +11,6 @@ from kivymd.uix.list import (
     OneLineAvatarIconListItem
 )
 
-# from bmconfigparser import BMConfigParser
-from pybitmessage.baseclass.common import toast
-
-# import queues
-from pybitmessage import state
-
 
 class Payment(Screen):
     """Payment Screen class for kivy Ui"""
diff --git a/src/tests/mock/pybitmessage/baseclass/popup.py b/src/tests/mock/pybitmessage/baseclass/popup.py
index a933d113..a1a1821e 100644
--- a/src/tests/mock/pybitmessage/baseclass/popup.py
+++ b/src/tests/mock/pybitmessage/baseclass/popup.py
@@ -7,7 +7,6 @@ from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.popup import Popup
 
 from pybitmessage import state
-from pybitmessage.addresses import decodeAddress
 from datetime import datetime
 
 from pybitmessage.baseclass.common import toast
diff --git a/src/tests/mock/pybitmessage/baseclass/sent.py b/src/tests/mock/pybitmessage/baseclass/sent.py
index 6feae309..5f094727 100644
--- a/src/tests/mock/pybitmessage/baseclass/sent.py
+++ b/src/tests/mock/pybitmessage/baseclass/sent.py
@@ -1,6 +1,5 @@
 from functools import partial
 from kivy.clock import Clock
-from kivy.factory import Factory
 from kivy.properties import StringProperty, ListProperty
 
 from kivy.uix.screenmanager import Screen
diff --git a/src/tests/mock/pybitmessage/baseclass/trash.py b/src/tests/mock/pybitmessage/baseclass/trash.py
index f082e891..f141a9a7 100644
--- a/src/tests/mock/pybitmessage/baseclass/trash.py
+++ b/src/tests/mock/pybitmessage/baseclass/trash.py
@@ -1,22 +1,14 @@
-from pybitmessage.get_platform import platform
-from functools import partial
 from kivy.clock import Clock
 from kivy.properties import (
     ListProperty,
     StringProperty
 )
-from kivymd.uix.button import MDFlatButton
-from kivymd.uix.dialog import MDDialog
 from kivymd.uix.label import MDLabel
 from kivy.uix.screenmanager import Screen
 
 from pybitmessage import state
 
-from pybitmessage.baseclass.common import (
-    toast, showLimitedCnt, ThemeClsColor,
-    CutsomSwipeToDeleteItem, ShowTimeHistoy,
-    avatarImageFirstLetter
-)
+from pybitmessage.baseclass.common import showLimitedCnt
 
 
 class Trash(Screen):