diff --git a/.isort.cfg b/.isort.cfg
index 4128eba2..c0944b0e 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -1,4 +1,4 @@
 [settings]
 multi_line_output = 3
-known_third_party = dateutil,httpretty,pytest,selenium,setuptools,urllib3
+known_third_party = dateutil,httpretty,pytest,selenium,setuptools,urllib3,mock
 known_first_party = test
diff --git a/README.md b/README.md
index 2d39e2f9..e182b705 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,9 @@ download and unarchive the source tarball (Appium-Python-Client-X.X.tar.gz).
         ```
         $ python -m isort -rc .
         ```
+        - When you use newly 3rd party modules, add it to [.isort.cfg](.isort.cfg) to keep import order correct
+- Docstring style: Google Style
+    - Refer [link](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html)
 - You can customise `CHANGELOG.rst` with commit messages following [.gitchangelog.rc](.gitchangelog.rc)
     - It generates readable changelog
 - Setup
diff --git a/test/functional/android/activities_tests.py b/test/functional/android/activities_tests.py
index 63356fe8..dfe869c4 100644
--- a/test/functional/android/activities_tests.py
+++ b/test/functional/android/activities_tests.py
@@ -15,20 +15,10 @@
 
 import unittest
 
-from appium import webdriver
-
-from .helper import desired_capabilities
 from .helper.test_helper import BaseTestCase
 
 
 class ActivitiesTests(BaseTestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
-
     def test_current_activity(self):
         activity = self.driver.current_activity
         self.assertEqual('.ApiDemos', activity)