diff --git a/src/bitmessagekivy/tests/test_addressbook.py b/src/bitmessagekivy/tests/test_addressbook.py
index 7bc2d57f..313205ed 100644
--- a/src/bitmessagekivy/tests/test_addressbook.py
+++ b/src/bitmessagekivy/tests/test_addressbook.py
@@ -14,7 +14,7 @@ class AddressBook(TeleniumTestProcess):
     def test_save_address(self):
         """Save Address On Address Book Screen/Window"""
         print("=====================Test -Save Address In Address Book=====================")
-        self.cli.sleep(3)
+        self.cli.sleep(8)
         # this is for checking current screen
         self.assertExists("//Inbox[@name~=\"inbox\"]", timeout=3)
         # this is for opening Nav drawer
diff --git a/src/bitmessagekivy/tests/test_create_random_address.py b/src/bitmessagekivy/tests/test_create_random_address.py
index 35fe59f7..e22e0028 100644
--- a/src/bitmessagekivy/tests/test_create_random_address.py
+++ b/src/bitmessagekivy/tests/test_create_random_address.py
@@ -18,7 +18,7 @@ class CreateRandomAddress(TeleniumTestProcess):
     def test_login_screen(self):
         """Clicking on Proceed Button to Proceed to Next Screen."""
         print("=====================Test - Login Screen=====================")
-        self.cli.sleep(10)
+        self.cli.sleep(8)
         # Checking current Screen(Login screen)
         self.assertExists("//Login[@name~=\"login\"]", timeout=3)
         # Clicking on Proceed Next Button
diff --git a/src/bitmessagekivy/tests/test_myaddress_screen.py b/src/bitmessagekivy/tests/test_myaddress_screen.py
index 1476dad3..c536ef58 100644
--- a/src/bitmessagekivy/tests/test_myaddress_screen.py
+++ b/src/bitmessagekivy/tests/test_myaddress_screen.py
@@ -1,8 +1,7 @@
-from time import sleep
-from requests.packages.urllib3.util import timeout
 from .telenium_process import TeleniumTestProcess
 from .common import ordered
 
+
 data = [
     'BM-2cWmjntZ47WKEUtocrdvs19y5CivpKoi1h',
     'BM-2cVpswZo8rWLXDVtZEUNcDQvnvHJ6TLRYr'
@@ -15,7 +14,7 @@ class MyAddressScreen(TeleniumTestProcess):
     def test_select_myaddress_list(self):
         """Select Address From List of Address"""
         print("=====================Test -Select Address From List of Address=====================")
-        self.cli.sleep(12)
+        self.cli.sleep(8)
         # this is for checking current screen
         self.assertExists("//Inbox[@name~=\"inbox\"]", timeout=3)
         # this is for opening Nav drawer
diff --git a/src/bitmessagekivy/tests/test_network_screen.py b/src/bitmessagekivy/tests/test_network_screen.py
index 42628371..1f4bcd6e 100644
--- a/src/bitmessagekivy/tests/test_network_screen.py
+++ b/src/bitmessagekivy/tests/test_network_screen.py
@@ -7,7 +7,7 @@ class NetwrokStatusScreen(TeleniumTestProcess):
     def test_network_status(self):
         """Show NetwrokStatus"""
         print("=====================Test -Show NetwrokStatus=====================")
-        self.cli.sleep(10)
+        self.cli.sleep(8)
         # this is for opening Nav drawer
         self.cli.wait_click('//MDActionTopAppBarButton[@icon=\"menu\"]', timeout=2)
         # checking state of Nav drawer
diff --git a/src/bitmessagekivy/tests/test_payment_subscription.py b/src/bitmessagekivy/tests/test_payment_subscription.py
index 441122f5..cc1c5e21 100644
--- a/src/bitmessagekivy/tests/test_payment_subscription.py
+++ b/src/bitmessagekivy/tests/test_payment_subscription.py
@@ -1,6 +1,3 @@
-from time import time
-
-from kivy.core.window import Animation
 from .telenium_process import TeleniumTestProcess
 
 
@@ -10,12 +7,12 @@ class PaymentScreen(TeleniumTestProcess):
     def test_select_subscripton(self):
         """Select Subscripton From List of Subscriptons"""
         print("=====================Test -Select Subscripton From List of Subscriptons=====================")
-        self.cli.sleep(10)
+        self.cli.sleep(8)
         # this is for opening Nav drawer
         self.cli.wait_click('//MDActionTopAppBarButton[@icon=\"menu\"]', timeout=3)
         # checking state of Nav drawer
         self.assertExists("//MDNavigationDrawer[@state~=\"open\"]", timeout=2)
-        # Dragging from sent to inbox to get Payment tab.
+        # Dragging from sent to inbox to get Payment tab
         self.drag("//NavigationItem[@text=\"Sent\"]", "//NavigationItem[@text=\"Inbox\"]")
         # assert for checking scroll function
         self.assertCheckScrollDown('//ContentNavigationDrawer//ScrollView[0]', timeout=3)
@@ -23,16 +20,13 @@ class PaymentScreen(TeleniumTestProcess):
         self.cli.wait_click('//NavigationItem[@text=\"Purchase\"]', timeout=2)
         # Assert for checking Current Screen
         self.assertExists("//Payment[@name~=\"payment\"]", timeout=3)
-        # Scrolling Down Product list 
+        # Scrolling Down Product list
         self.cli.sleep(0.5)
         self.drag(
             '//ProductCategoryLayout[0]/ProductLayout[1]',
             '//ProductCategoryLayout[0]/ProductLayout[0]')
         # assert for checking scroll function
         self.assertCheckScrollDown('//Payment//ScrollView[0]', timeout=3)
-        self.cli.sleep(2)
-        print(self.cli.getattr('//Payment//MDCustomBottomSheet//MDBottomSheet[0]', 'animation'), 'pop is open or not  ----------------------------------------------````````````````````````````````````````````````````````````~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-        self.cli.sleep(2)
         # Click on BUY Button
         self.cli.wait_click('//MDRaisedButton[@text=\"BUY\"]', timeout=2)
         # CLick on the Payment Method
@@ -43,4 +37,3 @@ class PaymentScreen(TeleniumTestProcess):
         self.cli.wait_click('//MDRaisedButton[3]', timeout=2)
         # Checking Current screen(Payment screen)
         self.assertExists("//Payment[@name~=\"payment\"]", timeout=2)
-        
\ No newline at end of file
diff --git a/src/bitmessagekivy/tests/test_setting_screen.py b/src/bitmessagekivy/tests/test_setting_screen.py
index e704d2df..cffcfa7d 100644
--- a/src/bitmessagekivy/tests/test_setting_screen.py
+++ b/src/bitmessagekivy/tests/test_setting_screen.py
@@ -7,7 +7,7 @@ class SettingScreen(TeleniumTestProcess):
     def test_setting_screen(self):
         """Show Setting Screen"""
         print("=====================Test -Show Setting Screen=====================")
-        self.cli.sleep(12)
+        self.cli.sleep(8)
         # this is for checking current screen
         self.assertExists("//Inbox[@name~=\"inbox\"]", timeout=3)
         # this is for opening Nav drawer
diff --git a/src/bitmessagekivy/tests/test_trash_message.py b/src/bitmessagekivy/tests/test_trash_message.py
index d4401808..de21944d 100644
--- a/src/bitmessagekivy/tests/test_trash_message.py
+++ b/src/bitmessagekivy/tests/test_trash_message.py
@@ -6,7 +6,7 @@ class TrashMessage(TeleniumTestProcess):
     def test_delete_trash_message(self):
         """Delete Trash message permanently from trash message listing"""
         print("=====================Test -Delete Message From Trash Message Listing=====================")
-        self.cli.sleep(3)
+        self.cli.sleep()
         # this is for opening Nav drawer
         self.cli.wait_click('//MDActionTopAppBarButton[@icon=\"menu\"]', timeout=5)
         # checking state of Nav drawer