diff --git a/src/tests/mock/kivy_main.py b/src/tests/mock/kivy_main.py
index badc1dc1..9c68f3af 100644
--- a/src/tests/mock/kivy_main.py
+++ b/src/tests/mock/kivy_main.py
@@ -1,14 +1,14 @@
 """Mock kivy app with mock threads."""
 
 from pybitmessage import state
-from pybitmessage.bitmessagekivy.mpybit import NavigateApp
-from class_addressGenerator import FakeAddressGenerator
+from pybitmessage.mpybit import NavigateApp
+from pybitmessage.class_addressGenerator import addressGenerator
 
 
 def main():
     """main method for starting threads"""
     # Start the address generation thread
-    addressGeneratorThread = FakeAddressGenerator()
+    addressGeneratorThread = addressGenerator()
     # close the main program even if there are threads left
     addressGeneratorThread.daemon = True
     addressGeneratorThread.start()
diff --git a/src/tests/mock/pybitmessage/mpybit.py b/src/tests/mock/pybitmessage/mpybit.py
new file mode 100644
index 00000000..b44b1070
--- /dev/null
+++ b/src/tests/mock/pybitmessage/mpybit.py
@@ -0,0 +1,28 @@
+"""
+    Dummy implementation for kivy Desktop and android(mobile) interface
+"""
+# pylint: disable=too-few-public-methods
+
+from kivy.app import App
+from kivy.uix.label import Label
+
+
+class NavigateApp(App):
+    """Navigation Layout of class"""
+
+    def build(self):
+        """Method builds the widget"""
+        # pylint: disable=no-self-use
+        return Label(text="Hello World !")
+
+    def clickNavDrawer(self):
+        """method for clicking navigation drawer"""
+        pass
+
+    def addingtoaddressbook(self):
+        """method for clicking address book popup"""
+        pass
+
+
+if __name__ == '__main__':
+    NavigateApp().run()