diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..17e15f27
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/bitmessagekivy/tests/test_payment_subscription.py b/src/bitmessagekivy/tests/test_payment_subscription.py
index 36a88bef..421279e4 100644
--- a/src/bitmessagekivy/tests/test_payment_subscription.py
+++ b/src/bitmessagekivy/tests/test_payment_subscription.py
@@ -7,19 +7,19 @@ 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(4)
-        self.cli.click_on('//MDToolbar/BoxLayout[0]/MDActionTopAppBarButton[0]')
-        self.cli.sleep(3)
-        self.cli.drag("//NavigationItem[@text=\"Sent\"]", "//NavigationItem[@text=\"Inbox\"]", 1)
-        self.cli.sleep(3)
-        self.cli.click_on('//NavigationItem[8]')
+        self.cli.sleep(10)
+        # this is for opening Nav drawer
+        self.click_on('//MDActionTopAppBarButton[@icon=\"menu\"]')
+        # Dragging from sent to inbox to get Payment tab.
+        self.drag("//NavigationItem[@text=\"Sent\"]", "//NavigationItem[@text=\"Inbox\"]")
+        # this is for opening Payment screen
+        self.click_on('//NavigationItem[@text=\"Purchase\"]', seconds=1)
         self.assertExists("//Payment[@name~=\"payment\"]", timeout=2)
-        self.cli.sleep(3)
         self.cli.drag(
             '//Payment/BoxLayout[0]/ScrollView[0]/BoxLayout[0]/ProductCategoryLayout[0]/ProductLayout[1]',
             '//Payment/BoxLayout[0]/ScrollView[0]/BoxLayout[0]/ProductCategoryLayout[0]/ProductLayout[0]', 1)
         self.cli.sleep(2)
-        self.cli.click_on('//MDRaisedButton[3]')
+        self.click_on('//MDRaisedButton[3]')
         self.cli.sleep(2)
         self.cli.click_on('//ListItemWithLabel[0]')
         self.cli.sleep(2)
diff --git a/src/bitmessagekivy/tests/test_trash_message.py b/src/bitmessagekivy/tests/test_trash_message.py
index f7021330..7d69a4e3 100644
--- a/src/bitmessagekivy/tests/test_trash_message.py
+++ b/src/bitmessagekivy/tests/test_trash_message.py
@@ -7,21 +7,25 @@ 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(4)
-        self.cli.click_on('//MDToolbar/BoxLayout[0]/MDActionTopAppBarButton[0]')
-        self.cli.sleep(4)
-        self.cli.click_on('//NavigationItem[4]')
+        self.cli.sleep(8)
+        # this is for opening Nav drawer
+        self.click_on('//MDActionTopAppBarButton[@icon=\"menu\"]')
+        # checking state of Nav drawer
+        self.assertEqual(self.cli.getattr('//MDNavigationDrawer', 'state'), 'open')
+        # this is for opening Trash screen
+        self.click_on('//NavigationItem[@text=\"Trash\"]')
+        # self.cli.click_on('//NavigationItem[4]')
         self.assertExists("//Trash[@name~=\"trash\"]", timeout=2)
         self.cli.sleep(4)
-        self.cli.drag(
-            '//MDList[0]/CutsomSwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]/BoxLayout[1]',
-            '//MDList[0]/CutsomSwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]/BoxLayout[2]', 1)
-        self.cli.click_on('//MDList[0]/CutsomSwipeToDeleteItem[0]')
-        self.cli.sleep(4)
-        self.cli.click_on('//MDList[0]/CutsomSwipeToDeleteItem[0]//MDIconButton[0]')
-        self.cli.sleep(2)
-        self.cli.click_on('//MDDialog/MDCard[0]/AnchorLayout[0]/MDBoxLayout[0]/MDFlatButton[0]')
+        # This is for swiping message to activate delete icon.
+        self.drag(
+            '//Trash[0]//TwoLineAvatarIconListItem[0]/BoxLayout[1]',
+            '//Trash[0]//TwoLineAvatarIconListItem[0]/BoxLayout[2]')
+        self.click_on('//MDList[0]/CutsomSwipeToDeleteItem[0]', seconds=1)
+        # clicking on Trash Box icon to delete message.
+        self.click_on('//MDList[0]/CutsomSwipeToDeleteItem[0]//MDIconButton[0]', seconds=2)
+        # Clicking on 'Yes' Button on Popup to confirm delete.
+        self.click_on('//MDDialog//MDFlatButton[@text=\"Yes\"]', seconds=1.1)
         # self.cli.click_on('//MDDialog/DialogFakeCard[0]/AnchorLayout[0]/MDBoxLayout[0]/MDFlatButton[0]')
-        self.cli.sleep(2)
         total_trash_msgs = len(self.cli.select("//CutsomSwipeToDeleteItem"))
         self.assertEqual(total_trash_msgs, 1)