Merge lp:~elopio/ubuntu-system-settings/my_less_flaky into lp:ubuntu-system-settings

[Leo Arias]

Not yet ready, I'm proposing it to see the jenkins' results.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1229
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/ubuntu-system-settings/my_less_flaky/+merge/245879/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1886/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/737
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16944

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1886/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-11-11 14:54:10 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-01-08 16:44:36 +0000
@@ -119,6 +119,27 @@
     def go_to_cellular_page(self):
         return self._go_to_page('entryComponent-cellular', 'cellularPage')
 
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_phone_page(self):
+        return self._go_to_page('entryComponent-phone', 'phonePage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_about_page(self):
+        return self._go_to_page('entryComponent-about', 'aboutPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_sound_page(self):
+        return self._go_to_page('entryComponent-sound', 'soundPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_security_page(self):
+        return self._go_to_page('entryComponent-security-privacy',
+                                'securityPrivacyPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_datetime_page(self):
+        return self._go_to_page('entryComponent-time-date', 'timeDatePage')
+
     def _go_to_page(self, item_object_name, page_object_name):
         self.click_item(item_object_name)
         page = self.wait_select_single(objectName=page_object_name)
@@ -150,11 +171,6 @@
         return self.select_single(objectName='systemSettingsPage')
 
     @property
-    def cellular_page(self):
-        """ Return 'Cellular' page """
-        return self.select_single(objectName='cellularPage')
-
-    @property
     def choose_page(self):
         """ Return 'Choose carrier' page """
         return self.select_single(objectName="chooseCarrierPage")
@@ -175,26 +191,6 @@
         return self.select_single(objectName='backgroundPage')
 
     @property
-    def sound_page(self):
-        """ Return 'Sound' page """
-        return self.select_single(objectName='soundPage')
-
-    @property
-    def security_page(self):
-        """ Return 'Security' page """
-        return self.select_single(objectName='securityPrivacyPage')
-
-    @property
-    def about_page(self):
-        """ Return 'About' page """
-        return self.select_single(objectName='aboutPage')
-
-    @property
-    def wifi_page(self):
-        """ Return 'Wifi' page """
-        return self.select_single(objectName='wifiPage')
-
-    @property
     def _orientation_lock_switch(self):
         return self.wait_select_single(
             ubuntuuitoolkit.CheckBox,
@@ -209,7 +205,7 @@
 
 class CellularPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """Autopilot helper for the Sound page."""
+    """Autopilot helper for the Cellular page."""
 
     @classmethod
     def validate_dbus_object(cls, path, state):
@@ -390,7 +386,7 @@
 
 class TimeAndDatePage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """Autopilot helper for the Sound page."""
+    """Autopilot helper for the TimeAndDate page."""
 
     @classmethod
     def validate_dbus_object(cls, path, state):
@@ -421,7 +417,7 @@
     @classmethod
     def validate_dbus_object(cls, path, state):
         name = introspection.get_classname_from_path(path)
-        if name == b'ItemPage':
+        if name == b'PageComponent':
             if state['objectName'][1] == 'aboutPage':
                 return True
         return False
@@ -464,6 +460,7 @@
     def go_to_check_for_updates(self):
         check_for_updates_button = self.select_single(
             objectName='updateButton')
+        check_for_updates_button.swipe_into_view()
         self.pointing_device.click_object(check_for_updates_button)
         system_updates_page = self.get_root_instance().wait_select_single(
             objectName='systemUpdatesPage')
@@ -481,6 +478,10 @@
         licenses_page.active.wait_for(True)
         return licenses_page
 
+    def get_number(self, obj):
+        number = self.select_single(objectName=obj)
+        return number.value
+
 
 class LicensesPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -576,6 +577,18 @@
 
         return self._go_to_page(find, 'servicesPage')
 
+    @property
+    def _dialpad_sounds(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.CheckBox,
+            objectName='dialpadSounds')
+
+    def enable_dialpad_sounds(self):
+        self._dialpad_sounds.check()
+
+    def disable_dialpad_sounds(self):
+        self._dialpad_sounds.uncheck()
+
 
 class CallWaiting(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-12-01 15:24:55 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-01-08 16:44:36 +0000
@@ -60,8 +60,9 @@
     def setUp(self, panel=None):
         super(UbuntuSystemSettingsTestCase, self).setUp()
         self.system_settings = SystemSettings(self, panel=panel)
+        self.main_view = self.system_settings.main_view
         self.assertThat(
-            self.system_settings.main_view.visible,
+            self.main_view.visible,
             Eventually(Equals(True)))
 
     def set_orientation(self, gsettings, value):
@@ -109,10 +110,6 @@
     def setUp(self):
         super(UbuntuSystemSettingsBatteryTestCase, self).setUp()
         self.add_mock_battery()
-        self.system_settings = SystemSettings(self)
-        self.assertThat(
-            self.system_settings.main_view.visible,
-            Eventually(Equals(True)))
 
 
 class UbuntuSystemSettingsOfonoTestCase(UbuntuSystemSettingsTestCase,
@@ -124,14 +121,14 @@
     @property
     def choose_carrier_page(self):
         """Return carrier selection page"""
-        return self.system_settings.main_view.select_single(
+        return self.main_view.select_single(
             objectName='chooseCarrierPage'
         )
 
     @property
     def choose_carriers_page(self):
         """Return carriers selection page"""
-        return self.system_settings.main_view.select_single(
+        return self.main_view.select_single(
             objectName='chooseCarriersPage'
         )
 
@@ -289,6 +286,12 @@
             template, stdout=subprocess.PIPE)
         cls.dbusmock = dbus.Interface(cls.obj_ofono, dbusmock.MOCK_IFACE)
 
+    @classmethod
+    def tearDownClass(cls):
+        super(UbuntuSystemSettingsOfonoTestCase, cls).tearDownClass()
+        cls.p_mock.terminate()
+        cls.p_mock.wait()
+
     def setUp(self, panel=None):
         self.obj_ofono.Reset()
 
@@ -296,7 +299,7 @@
         if self.use_sims == 2:
             self.add_sim2()
 
-        super(UbuntuSystemSettingsOfonoTestCase, self).setUp(panel)
+        super(UbuntuSystemSettingsOfonoTestCase, self).setUp()
 
     def set_default_for_calls(self, gsettings, default):
         gsettings.set_value('default-sim-for-calls', default)
@@ -309,12 +312,12 @@
         sleep(1)
 
     def get_default_sim_for_calls_selector(self, text):
-        return self.system_settings.main_view.cellular_page.select_single(
+        return self.cellular_page.select_single(
             objectName="defaultForCalls" + text
         )
 
     def get_default_sim_for_messages_selector(self, text):
-        return self.system_settings.main_view.cellular_page.select_single(
+        return self.cellular_page.select_single(
             objectName="defaultForMessages" + text
         )
 
@@ -324,35 +327,28 @@
     def setUp(self):
         """ Go to Cellular page """
         super(CellularBaseTestCase, self).setUp()
-        self.cellular_page = self.system_settings.\
-            main_view.go_to_cellular_page()
+        self.cellular_page = self.main_view.go_to_cellular_page()
 
 
 class PhoneOfonoBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
     def setUp(self):
         """ Go to Phone page """
-        super(PhoneOfonoBaseTestCase, self).setUp('phone')
-        self.phone_page = self.system_settings.main_view.select_single(
-            objectName='phonePage'
-        )
+        super(PhoneOfonoBaseTestCase, self).setUp()
+        self.phone_page = self.main_view.go_to_phone_page()
 
 
 class AboutBaseTestCase(UbuntuSystemSettingsTestCase):
     def setUp(self):
         """Go to About page."""
-        super(AboutBaseTestCase, self).setUp('about')
-        self.about_page = self.system_settings.main_view.select_single(
-            objectName='aboutPage'
-        )
+        super(AboutBaseTestCase, self).setUp()
+        self.about_page = self.main_view.go_to_about_page()
 
 
 class AboutOfonoBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
     def setUp(self):
         """Go to About page."""
-        super(AboutOfonoBaseTestCase, self).setUp('about')
-        self.about_page = self.system_settings.main_view.select_single(
-            objectName='aboutPage'
-        )
+        super(AboutOfonoBaseTestCase, self).setUp()
+        self.about_page = self.main_view.go_to_about_page()
 
 
 class AboutSystemImageBaseTestCase(AboutBaseTestCase,
@@ -396,12 +392,15 @@
     def setUp(self):
         """Go to Storage Page."""
         super(StorageBaseTestCase, self).setUp()
-        self.system_settings.main_view.click_item('storageItem')
+        self.main_view.click_item('storageItem')
+        self.storage_page = self.main_view.select_single(
+            'Storage', objectName='storagePage'
+        )
         self.assertThat(self.storage_page.active, Eventually(Equals(True)))
 
     def assert_space_item(self, object_name, text):
         """ Checks whether an space item exists and returns a value """
-        item = self.system_settings.main_view.storage_page.select_single(
+        item = self.main_view.storage_page.select_single(
             objectName=object_name
         )
         self.assertThat(item, NotEquals(None))
@@ -417,13 +416,6 @@
         return self.main_view.wait_select_single(
             'StorageItem', objectName=objectName).value
 
-    @property
-    def storage_page(self):
-        """ Return 'Storage' page """
-        return self.system_settings.main_view.select_single(
-            'Storage', objectName='storagePage'
-        )
-
 
 class LicenseBaseTestCase(AboutBaseTestCase):
 
@@ -442,8 +434,7 @@
     def setUp(self):
         """Go to SystemUpdates Page."""
         super(SystemUpdatesBaseTestCase, self).setUp()
-        self.system_settings.main_view.click_item(
-            'entryComponent-system-update')
+        self.main_view.click_item('entryComponent-system-update')
 
 
 class BackgroundBaseTestCase(
@@ -515,7 +506,7 @@
             'SYSTEM_SETTINGS_UBUNTU_ART_DIR', art_dir))
 
         super(BackgroundBaseTestCase, self).setUp('background')
-        self.assertThat(self.system_settings.main_view.background_page.active,
+        self.assertThat(self.main_view.background_page.active,
                         Eventually(Equals(True)))
 
     def tearDown(self):
@@ -532,11 +523,14 @@
     @classmethod
     def setUpClass(klass):
         klass.start_system_bus()
-        klass.start_session_bus()
         klass.dbus_con = klass.get_dbus(True)
         klass.dbus_con_session = klass.get_dbus(False)
 
     def setUp(self, panel='sound'):
+        # TODO only do this if the sound indicator is running.
+        # --elopio - 2015-01-08
+        self.stop_sound_indicator()
+        self.addCleanup(self.start_sound_indicator)
 
         user_obj = '/user/foo'
 
@@ -562,7 +556,9 @@
                                              GTK_ACTIONS_IFACE,
                                              stdout=subprocess.PIPE)
 
-        sleep(2)
+        self.wait_for_bus_object(ACCOUNTS_IFACE,
+                                 ACCOUNTS_OBJ,
+                                 system_bus=True)
 
         self.dbus_mock = dbus.Interface(self.dbus_con.get_object(
                                         ACCOUNTS_IFACE,
@@ -570,6 +566,9 @@
                                         ACCOUNTS_IFACE),
                                         dbusmock.MOCK_IFACE)
 
+        self.wait_for_bus_object(ISOUND_SERVICE,
+                                 ISOUND_ACTION_PATH)
+
         self.dbus_mock_isound = dbus.Interface(
             self.dbus_con_session.get_object(
                 ISOUND_SERVICE,
@@ -626,8 +625,8 @@
                     ACCOUNTS_SOUND_IFACE)
             ])
 
-        self.obj_test = self.dbus_con.get_object(ACCOUNTS_IFACE, user_obj,
-                                                 ACCOUNTS_IFACE)
+        self.obj_snd = self.dbus_con.get_object(ACCOUNTS_IFACE, user_obj,
+                                                ACCOUNTS_IFACE)
 
         self.dbus_mock_isound.AddMethods(
             GTK_ACTIONS_IFACE,
@@ -661,9 +660,11 @@
 
         super(SoundBaseTestCase, self).setUp(panel)
 
-        """ Go to Sound page """
         if panel == 'sound':
-            self.assertThat(self.system_settings.main_view.sound_page.active,
+            self.sound_page = self.main_view.select_single(
+                objectName='soundPage'
+            )
+            self.assertThat(self.sound_page.active,
                             Eventually(Equals(True)))
 
     def tearDown(self):
@@ -673,6 +674,12 @@
         self.mock_isound.wait()
         super(SoundBaseTestCase, self).tearDown()
 
+    def start_sound_indicator(self):
+        subprocess.call(['initctl', 'start', 'indicator-sound'])
+
+    def stop_sound_indicator(self):
+        subprocess.call(['initctl', 'stop', 'indicator-sound'])
+
 
 class ResetBaseTestCase(UbuntuSystemSettingsTestCase,
                         dbusmock.DBusTestCase):
@@ -698,7 +705,7 @@
     def setUp(self):
         self.mock_for_factory_reset()
         super(ResetBaseTestCase, self).setUp()
-        self.reset_page = self.system_settings.main_view.go_to_reset_phone()
+        self.reset_page = self.main_view.go_to_reset_phone()
 
     def tearDown(self):
         self.mock_server.terminate()
@@ -710,30 +717,13 @@
     """ Base class for security and privacy settings tests"""
 
     def setUp(self):
-        super(SecurityBaseTestCase, self).setUp('security-privacy')
-        """ Go to Security & Privacy page """
-        self.security_page = self.system_settings.main_view.select_single(
-            objectName='securityPrivacyPage'
-        )
-        self.assertThat(self.security_page.active,
-                        Eventually(Equals(True)))
+        super(SecurityBaseTestCase, self).setUp()
+        self.security_page = self.main_view.go_to_security_page()
 
     def tearDown(self):
         super(SecurityBaseTestCase, self).tearDown()
 
 
-class PhoneSoundBaseTestCase(SoundBaseTestCase):
-    def setUp(self):
-        """ Go to Phone page """
-        super(PhoneSoundBaseTestCase, self).setUp('phone')
-        self.phone_page = self.system_settings.main_view.select_single(
-            objectName='phonePage'
-        )
-
-    def tearDown(self):
-        super(PhoneSoundBaseTestCase, self).tearDown()
-
-
 class LanguageBaseTestCase(UbuntuSystemSettingsTestCase,
                            dbusmock.DBusTestCase):
     """ Base class for language settings tests"""
@@ -759,8 +749,7 @@
         self.mock_loginmanager()
 
         super(LanguageBaseTestCase, self).setUp()
-        self.language_page = self.system_settings.\
-            main_view.go_to_language_page()
+        self.language_page = self.main_view.go_to_language_page()
 
     def tearDown(self):
         self.mock_server.terminate()
@@ -799,8 +788,7 @@
             pass
 
         super(WifiBaseTestCase, self).setUp()
-        self.wifi_page = self.system_settings.\
-            main_view.go_to_wifi_page()
+        self.wifi_page = self.main_view.go_to_wifi_page()
 
     def add_previous_networks(self, networks):
         dev_path = str(self.obj_nm.GetDevices()[0])
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-11-19 12:03:35 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2015-01-08 16:44:36 +0000
@@ -133,10 +133,8 @@
             self.assertThat(displayed_imei, Equals(device_imei))
 
     def test_phone_number(self):
-        number = self.system_settings.main_view.about_page.select_single(
-            objectName="numberItem"
-        )
-        self.assertEqual(str(number.value), "123456789")
+        self.assertEqual(str(self.about_page.get_number('numberItem')),
+                         '123456789')
 
 
 class AboutOfonoMultiSimTestCase(AboutOfonoBaseTestCase):
@@ -144,14 +142,10 @@
     use_sims = 2
 
     def test_phone_numbers(self):
-        number1 = self.system_settings.main_view.about_page.select_single(
-            objectName="numberItem1"
-        )
-        number2 = self.system_settings.main_view.about_page.select_single(
-            objectName="numberItem2"
-        )
-        self.assertEqual(str(number1.value), "123456789")
-        self.assertEqual(str(number2.value), "08123")
+        self.assertEqual(str(self.about_page.get_number('numberItem1')),
+                         '123456789')
+        self.assertEqual(str(self.about_page.get_number('numberItem2')),
+                         '08123')
 
 
 class AboutSystemImageTestCase(AboutSystemImageBaseTestCase):
@@ -219,7 +213,7 @@
 
     def test_disk(self):
         """ Checks whether disk item is available """
-        disk_item = self.system_settings.main_view.storage_page.select_single(
+        disk_item = self.storage_page.select_single(
             objectName='diskItem'
         )
         self.assertThat(disk_item.text, Equals('Total storage'))
@@ -286,8 +280,9 @@
 
     def test_installed_apps(self):
         """ Checks whether Installed Apps list is available """
-        installed_apps_list_view = self.system_settings.main_view.\
-            storage_page.select_single(objectName='installedAppsListView')
+        installed_apps_list_view = self.storage_page.select_single(
+            objectName='installedAppsListView'
+        )
         self.assertThat(installed_apps_list_view, NotEquals(None))
 
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_background.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_background.py	2014-07-22 21:44:35 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_background.py	2015-01-08 16:44:36 +0000
@@ -24,7 +24,7 @@
 
     def setUp(self):
         super(BackgroundTestCase, self).setUp()
-        self.background_page = self.system_settings.main_view.background_page
+        self.background_page = self.main_view.background_page
 
     def get_wallpapergrid(self, name):
         """Return a WallpaperGrid with given name, or
@@ -64,9 +64,9 @@
 
     def save_wallpaper(self):
         """Click on Set/Save button when previewing a wallpaper"""
-        save = self.system_settings.main_view.wait_select_single(
+        save = self.main_view.wait_select_single(
             objectName='saveButton')
-        self.system_settings.main_view.scroll_to_and_click(save)
+        self.main_view.scroll_to_and_click(save)
 
     def test_background_page_title_is_correct(self):
         """ Checks whether Background page is available """
@@ -79,7 +79,7 @@
         old = self.selected_wallpaper.source
 
         # click a wallpaper that is not selected
-        self.system_settings.main_view.scroll_to_and_click(
+        self.main_view.scroll_to_and_click(
             self.all_wallpapers[3])
 
         # click set/save
@@ -112,5 +112,5 @@
             objectName='CustomHeader')
 
         self.assertEqual(custom.state, 'collapsed')
-        self.system_settings.main_view.scroll_to_and_click(custom_header)
+        self.main_view.scroll_to_and_click(custom_header)
         self.assertEqual(custom.state, '')
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_datetime.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-11-25 20:19:27 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2015-01-08 16:44:36 +0000
@@ -39,17 +39,12 @@
     def setUp(self):
         """ Go to Time & Date page """
         self.obj_timedate1.Reset()
-        super(TimeDateTestCase, self).setUp("time-date")
-
-    @property
-    def time_date_page(self):
-        return self.system_settings.main_view.select_single(
-            objectName='timeDatePage'
-        )
+        super(TimeDateTestCase, self).setUp()
+        self.page = self.main_view.go_to_datetime_page()
 
     @property
     def tz_page(self):
-        return self.system_settings.main_view.select_single(
+        return self.main_view.select_single(
             objectName='timeZone'
         )
 
@@ -67,22 +62,22 @@
                     raise e
 
     def click_tz_search_field(self):
-        self.system_settings.main_view.scroll_to_and_click(self.tz_page)
-        text_field = self.system_settings.main_view.wait_select_single(
+        self.main_view.scroll_to_and_click(self.tz_page)
+        text_field = self.main_view.wait_select_single(
             objectName='selectTimeZoneField'
         )
-        self.system_settings.main_view.pointing_device.move_to_object(
+        self.main_view.pointing_device.move_to_object(
             text_field)
 
     def test_time_date_page(self):
         """ Checks whether Time & Date page is available """
-        self.assertThat(self.time_date_page, NotEquals(None))
-        self.assertThat(self.time_date_page.title, Equals(_('Time & Date')))
+        self.assertThat(self.page, NotEquals(None))
+        self.assertThat(self.page.title, Equals(_('Time & Date')))
 
     def test_tz_list_initially_empty(self):
         """ Checks that no list is displayed initially """
-        self.system_settings.main_view.scroll_to_and_click(self.tz_page)
-        labelVisible = self.system_settings.main_view.wait_select_single(
+        self.main_view.scroll_to_and_click(self.tz_page)
+        labelVisible = self.main_view.wait_select_single(
             objectName='nothingLabel').visible
         self.assertThat(labelVisible, Equals(True))
 
@@ -90,7 +85,7 @@
         """ Check that searching for a valid location shows something """
         self.click_tz_search_field()
         self.keyboard.type('London, United Kingdom')
-        listview = self.system_settings.main_view.select_single(
+        listview = self.main_view.select_single(
             objectName='locationsListView'
         )
         self.assertThat(listview.count, Eventually(GreaterThan(0)))
@@ -99,11 +94,11 @@
         """ Check that searching for an invalid location shows nothing """
         self.click_tz_search_field()
         self.keyboard.type('Oh no you don\'t!')
-        listview = self.system_settings.main_view.select_single(
+        listview = self.main_view.select_single(
             objectName='locationsListView'
         )
         self.assertThat(listview.count, Equals(0))
-        labelVisible = self.system_settings.main_view.select_single(
+        labelVisible = self.main_view.select_single(
             objectName='nothingLabel').visible
         self.assertThat(labelVisible, Equals(True))
 
@@ -111,12 +106,12 @@
         """ Check that manually selecting a timezone sets it properly """
         self.click_tz_search_field()
         self.keyboard.type('London, United Kingdom')
-        listview = self.system_settings.main_view.select_single(
+        listview = self.main_view.select_single(
             objectName='locationsListView'
         )
         london = TimeDateTestCase.wait_select_listview_first(listview)
-        self.system_settings.main_view.pointing_device.click_object(london)
-        header = self.system_settings.main_view.select_single(
+        self.main_view.pointing_device.click_object(london)
+        header = self.main_view.select_single(
             objectName='MainView_Header'
         )
         self.assertThat(header.title, Eventually(Equals(_('Time & Date'))))
@@ -130,16 +125,16 @@
         self.click_tz_search_field()
         # This is also in Europe/London
         self.keyboard.type('Preston, United Kingdom')
-        listview = self.system_settings.main_view.select_single(
+        listview = self.main_view.select_single(
             objectName='locationsListView'
         )
 
         preston = TimeDateTestCase.wait_select_listview_first(listview)
-        self.system_settings.main_view.pointing_device.click_object(preston)
+        self.main_view.pointing_device.click_object(preston)
 
         # The timer is 1 second, wait and see that we haven't moved pages
         sleep(2)
-        header = self.system_settings.main_view.select_single(
+        header = self.main_view.select_single(
             objectName='MainView_Header'
         )
         self.assertThat(header.title, Eventually(Equals(_('Time zone'))))
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_main.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_main.py	2014-08-25 12:33:13 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_main.py	2015-01-08 16:44:36 +0000
@@ -26,8 +26,8 @@
         self.addCleanup(
             self.set_orientation, gsettings, GLib.Variant('b', current))
 
-        self.system_settings.main_view.disable_orientation_lock()
-        self.system_settings.main_view.enable_orientation_lock()
+        self.main_view.disable_orientation_lock()
+        self.main_view.enable_orientation_lock()
 
         self.assertThat(
             lambda: gsettings.get_value('rotation-lock').get_boolean(),
@@ -40,8 +40,8 @@
         self.addCleanup(
             self.set_orientation, gsettings, GLib.Variant('b', current))
 
-        self.system_settings.main_view.enable_orientation_lock()
-        self.system_settings.main_view.disable_orientation_lock()
+        self.main_view.enable_orientation_lock()
+        self.main_view.disable_orientation_lock()
 
         self.assertThat(
             lambda: gsettings.get_value('rotation-lock').get_boolean(),
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_phone.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_phone.py	2014-08-28 17:33:40 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_phone.py	2015-01-08 16:44:36 +0000
@@ -8,22 +8,20 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Contains, Equals, NotEquals
+from testtools.matchers import Contains, Equals
 
 from ubuntu_system_settings.tests import (
     PhoneOfonoBaseTestCase,
-    PhoneSoundBaseTestCase,
     CALL_FWD_IFACE,
     CALL_SETTINGS_IFACE
 )
 
 
 class PhoneTestCase(PhoneOfonoBaseTestCase):
-    """Tests for Phone Page"""
 
     def test_call_fwd(self):
         call_fwd_page = self.phone_page.go_to_call_forwarding()
-        call_fwd_page.set_forward("41444424")
+        call_fwd_page.set_forward('41444424')
 
         # Check that the forward has been set
         self.assertThat(
@@ -52,7 +50,6 @@
 
 
 class PhoneDualSimTestCase(PhoneOfonoBaseTestCase):
-    """Tests for Phone Page"""
 
     use_sims = 2
 
@@ -73,7 +70,7 @@
 
     def test_call_fwd_sim_2(self):
         call_fwd_page = self.phone_page.go_to_call_forwarding(sim=2)
-        call_fwd_page.set_forward("41444424")
+        call_fwd_page.set_forward('41444424')
 
         # Check that the forward has been set
         self.assertThat(
@@ -113,17 +110,3 @@
             lambda: str(self.modem_1.Get(CALL_SETTINGS_IFACE,
                                          'VoiceCallWaiting')),
             Eventually(Contains('enabled')))
-
-
-class PhoneSoundTestCase(PhoneSoundBaseTestCase):
-    """Tests for Phone Page"""
-
-    def test_dialpad_sounds_switch(self):
-        """ Check that dialpad_sounds is present and clickable"""
-        snd = self.phone_page.select_single(
-            objectName="dialpadSounds")
-        prev_value = self.obj_test.GetDialpadSoundsEnabled()
-        self.system_settings.main_view.scroll_to_and_click(snd)
-        self.assertThat(
-            lambda: self.obj_test.GetDialpadSoundsEnabled(),
-            Eventually(NotEquals(prev_value)))
 
=== added file 'tests/autopilot/ubuntu_system_settings/tests/test_phone_sound.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_phone_sound.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_phone_sound.py	2015-01-08 16:44:36 +0000
@@ -0,0 +1,32 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+from __future__ import absolute_import
+
+from autopilot.matchers import Eventually
+from testtools.matchers import NotEquals
+
+from ubuntu_system_settings.tests import SoundBaseTestCase
+
+
+class PhoneSoundTestCase(SoundBaseTestCase):
+    """Tests for Phone Page"""
+
+    def setUp(self):
+        super(PhoneSoundTestCase, self).setUp(panel=None)
+        self.page = self.main_view.go_to_phone_page()
+
+    def test_dialpad_sounds_switch(self):
+        """ Check that dialpad_sounds is present and clickable"""
+        prev_value = self.obj_snd.GetDialpadSoundsEnabled()
+        if not prev_value:
+            self.page.enable_dialpad_sounds()
+        else:
+            self.page.disable_dialpad_sounds()
+        self.assertThat(
+            lambda: self.obj_snd.GetDialpadSoundsEnabled(),
+            Eventually(NotEquals(prev_value)))
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_plugins.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2014-04-04 15:31:49 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2015-01-08 16:44:36 +0000
@@ -25,7 +25,7 @@
 
     def test_title(self):
         """ Checks whether the app title is correct """
-        header = self.system_settings.main_view.select_single(
+        header = self.main_view.select_single(
             objectName='systemSettingsPage'
         )
         self.assertThat(header, NotEquals(None))
@@ -33,14 +33,14 @@
 
     def test_search(self):
         """ Checks whether the Search box is available """
-        search = self.system_settings.main_view.select_single(
+        search = self.main_view.select_single(
             objectName='searchTextField'
         )
         self.assertThat(search, NotEquals(None))
 
     def test_network_category(self):
         """ Checks whether the Network category is available """
-        category = self.system_settings.main_view.select_single(
+        category = self.main_view.select_single(
             objectName='categoryGrid-network'
         )
         self.assertThat(category, NotEquals(None))
@@ -50,7 +50,7 @@
 
     def test_personal_category(self):
         """ Checks whether the Personal category is available """
-        category = self.system_settings.main_view.select_single(
+        category = self.main_view.select_single(
             objectName='categoryGrid-personal'
         )
         self.assertThat(category, NotEquals(None))
@@ -60,7 +60,7 @@
 
     def test_system_category(self):
         """ Checks whether the System category is available """
-        category = self.system_settings.main_view.select_single(
+        category = self.main_view.select_single(
             objectName='categoryGrid-system'
         )
         self.assertThat(category, NotEquals(None))
@@ -68,70 +68,70 @@
 
     def test_wifi_plugin(self):
         """ Checks whether the Wi-Fi plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-wifi'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_cellular_plugin(self):
         """ Checks whether the Cellunar plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-cellular'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_bluetooth_plugin(self):
         """ Checks whether the Bluetooth plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-bluetooth'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_background_plugin(self):
         """ Checks whether the Background plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-background'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_sound_plugin(self):
         """ Checks whether the Sound plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-sound'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_language_plugin(self):
         """ Checks whether the Language plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-language'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_accounts_plugin(self):
         """ Checks whether the Accounts plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-online-accounts'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_timedate_plugin(self):
         """ Checks whether the Time & Date plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-time-date'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_security_plugin(self):
         """ Checks whether the Security plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-security-privacy'
         )
         self.assertThat(plugin, NotEquals(None))
 
     def test_updates_plugin(self):
         """ Checks whether the Updates plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-system-update'
         )
         self.assertThat(plugin, NotEquals(None))
@@ -144,7 +144,7 @@
     def test_no_battery_plugin_without_battery(self):
         """ Checks whether the Battery plugin is not available
         as we have no battery """
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
+        self.assertThat(lambda: self.main_view.select_single(
             objectName='entryComponent-battery'),
             raises(StateNotFoundError)
         )
@@ -152,7 +152,7 @@
     def test_battery_plugin_battery_hotplugging(self):
         """ Checks whether hotplugging a battery makes the panel visible """
         self.add_mock_battery()
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-battery'
         )
         self.assertThat(plugin, NotEquals(None))
@@ -164,7 +164,7 @@
 
     def test_battery_plugin(self):
         """ Checks whether the Battery plugin is available """
-        plugin = self.system_settings.main_view.select_single(
+        plugin = self.main_view.select_single(
             objectName='entryComponent-battery'
         )
         self.assertThat(plugin, NotEquals(None))
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_search.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-08-22 16:20:46 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_search.py	2015-01-08 16:44:36 +0000
@@ -22,19 +22,19 @@
         super(SearchTestCases, self).setUp()
 
     def _get_entry_component(self, name):
-        return self.system_settings.main_view.wait_select_single(
+        return self.main_view.wait_select_single(
             objectName='entryComponent-' + name
         )
 
     def _get_all_entry_components(self):
-        return self.system_settings.main_view.select_many(
+        return self.main_view.select_many(
             'EntryComponent')
 
     def _type_into_search_box(self, text):
-        search_box = self.system_settings.main_view.select_single(
+        search_box = self.main_view.select_single(
             objectName='searchTextField'
         )
-        self.system_settings.main_view.scroll_to_and_click(search_box)
+        self.main_view.scroll_to_and_click(search_box)
         self.keyboard.type(_(text))
         self.assertThat(search_box.text, Eventually(Equals(text)))
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_security.py	2014-08-27 16:13:12 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-01-08 16:44:36 +0000
@@ -25,7 +25,7 @@
     def setUp(self):
         super(SecurityTestCase, self).setUp()
         self.assertEqual(['pin'], self.modem_0.Get(SIM_IFACE, 'LockedPins'))
-        prps = self.system_settings.main_view.security_page.get_properties()
+        prps = self.security_page.get_properties()
         self.use_powerd = prps['usePowerd']
         if self.use_powerd:
             gsettings = Gio.Settings.new('com.ubuntu.touch.system')
@@ -64,47 +64,49 @@
 
     def _go_to_phone_lock(self):
         selector = self.security_page.select_single(
-            objectName="lockingControl"
+            objectName='lockingControl'
         )
-        self.system_settings.main_view.scroll_to_and_click(selector)
+        self.main_view.scroll_to_and_click(selector)
 
     def _go_to_sim_lock(self):
         selector = self.security_page.select_single(
-            objectName="simControl"
+            objectName='simControl'
         )
-        self.system_settings.main_view.scroll_to_and_click(selector)
+        self.main_view.scroll_to_and_click(selector)
 
     def _go_to_sleep_values(self):
         self._go_to_phone_lock()
-        selector = self.system_settings.main_view.select_single(
-            objectName="lockTimeout"
+        selector = self.main_view.select_single(
+            objectName='lockTimeout'
         )
-        self.system_settings.main_view.scroll_to_and_click(selector)
+        self.main_view.scroll_to_and_click(selector)
 
     def _get_sleep_selector(self):
         self._go_to_sleep_values()
-        sleep_values_page = self.system_settings.main_view.select_single(
-            objectName='sleepValues')
+        sleep_values_page = self.main_view.select_single(
+            objectName='sleepValues'
+        )
         self.assertThat(
             sleep_values_page,
             NotEquals(None)
         )
         self._go_to_sleep_values()
-        sleep_values_page = self.system_settings.main_view.select_single(
-            objectName='sleepValues')
+        sleep_values_page = self.main_view.select_single(
+            objectName='sleepValues'
+        )
         return sleep_values_page.select_single(
             toolkit_emulators.ItemSelector,
-            objectName="sleepSelector"
+            objectName='sleepSelector'
         )
 
     def test_security_page(self):
         """ Checks whether Security page is available """
         self.assertThat(
-            self.system_settings.main_view.security_page,
+            self.security_page,
             NotEquals(None)
         )
         self.assertThat(
-            self.system_settings.main_view.security_page.title,
+            self.security_page.title,
             Equals(_('Security & Privacy'))
         )
 
@@ -125,8 +127,9 @@
 
     def test_phone_lock_page(self):
         self._go_to_phone_lock()
-        phone_lock_page = self.system_settings.main_view.select_single(
-            objectName='phoneLockingPage')
+        phone_lock_page = self.main_view.select_single(
+            objectName='phoneLockingPage'
+        )
         self.assertThat(
             phone_lock_page,
             NotEquals(None)
@@ -138,8 +141,9 @@
 
     def test_phone_lock_value(self):
         self._go_to_phone_lock()
-        phone_lock_page = self.system_settings.main_view.select_single(
-            objectName='phoneLockingPage')
+        phone_lock_page = self.main_view.select_single(
+            objectName='phoneLockingPage'
+        )
         actTimeout = self._get_activity_timeout()
         activityTimeout = phone_lock_page.select_single(
             objectName='lockTimeout').value
@@ -160,7 +164,7 @@
         selector = self._get_sleep_selector()
         to_select = selector.select_single(
             'OptionSelectorDelegate', text='Never')
-        self.system_settings.main_view.pointing_device.click_object(to_select)
+        self.main_view.pointing_device.click_object(to_select)
         to_select.selected.wait_for(True)
         sleep(1)
         actTimeout = self._get_activity_timeout()
@@ -173,7 +177,7 @@
         selector = self._get_sleep_selector()
         to_select = selector.select_single(
             'OptionSelectorDelegate', text='After 4 minutes')
-        self.system_settings.main_view.pointing_device.click_object(to_select)
+        self.main_view.pointing_device.click_object(to_select)
         to_select.selected.wait_for(True)
         sleep(1)
         actTimeout = self._get_activity_timeout()
@@ -196,31 +200,36 @@
 
     def test_sim_pin_lock_control(self):
         self._go_to_sim_lock()
-        sim_lock_control = self.system_settings.main_view.select_single(
-            objectName='simPinSwitch')
+        sim_lock_control = self.main_view.select_single(
+            objectName='simPinSwitch'
+        )
         locked = len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
         self.assertEquals(locked, sim_lock_control.checked)
 
     def test_sim_pin_lock_control_unlock(self):
         self._go_to_sim_lock()
-        sim_lock_control = self.system_settings.main_view.select_single(
-            objectName='simPinSwitch')
+        sim_lock_control = self.main_view.select_single(
+            objectName='simPinSwitch'
+        )
 
         self.assertTrue(sim_lock_control.checked)
 
-        self.system_settings.main_view.scroll_to_and_click(sim_lock_control)
+        self.main_view.scroll_to_and_click(sim_lock_control)
 
-        lock_dialog = self.system_settings.main_view.select_single(
-            objectName='lockDialogComponent')
+        lock_dialog = self.main_view.select_single(
+            objectName='lockDialogComponent'
+        )
         self.assertEqual(
             lock_dialog.title,
             _("Enter SIM PIN")
         )
 
-        prev_input = self.system_settings.main_view.select_single(
-            objectName='prevInput')
-        submit_button = self.system_settings.main_view.select_single(
-            objectName='lockButton')
+        prev_input = self.main_view.select_single(
+            objectName='prevInput'
+        )
+        submit_button = self.main_view.select_single(
+            objectName='lockButton'
+        )
 
         self.assertEqual(
             submit_button.text,
@@ -230,7 +239,7 @@
         self.assertFalse(
             submit_button.get_properties()['enabled']
         )
-        self.system_settings.main_view.scroll_to_and_click(prev_input)
+        self.main_view.scroll_to_and_click(prev_input)
         self.keyboard.type("246")
         self.assertFalse(
             submit_button.get_properties()['enabled']
@@ -241,7 +250,7 @@
             submit_button.get_properties()['enabled']
         )
 
-        self.system_settings.main_view.scroll_to_and_click(submit_button)
+        self.main_view.scroll_to_and_click(submit_button)
 
         self.assertFalse(sim_lock_control.checked)
 
@@ -252,24 +261,28 @@
     def test_sim_pin_lock_control_lock(self):
         self.modem_0.Set(SIM_IFACE, 'LockedPins', "")
         self._go_to_sim_lock()
-        sim_lock_control = self.system_settings.main_view.select_single(
-            objectName='simPinSwitch')
+        sim_lock_control = self.main_view.select_single(
+            objectName='simPinSwitch'
+        )
 
         self.assertFalse(sim_lock_control.checked)
 
-        self.system_settings.main_view.scroll_to_and_click(sim_lock_control)
+        self.main_view.scroll_to_and_click(sim_lock_control)
 
-        lock_dialog = self.system_settings.main_view.select_single(
-            objectName='lockDialogComponent')
+        lock_dialog = self.main_view.select_single(
+            objectName='lockDialogComponent'
+        )
         self.assertEqual(
             lock_dialog.title,
             _("Enter SIM PIN")
         )
 
-        prev_input = self.system_settings.main_view.select_single(
-            objectName='prevInput')
-        submit_button = self.system_settings.main_view.select_single(
-            objectName='lockButton')
+        prev_input = self.main_view.select_single(
+            objectName='prevInput'
+        )
+        submit_button = self.main_view.select_single(
+            objectName='lockButton'
+        )
 
         self.assertEqual(
             submit_button.text,
@@ -279,7 +292,7 @@
         self.assertFalse(
             submit_button.get_properties()['enabled']
         )
-        self.system_settings.main_view.scroll_to_and_click(prev_input)
+        self.main_view.scroll_to_and_click(prev_input)
         self.keyboard.type("246")
         self.assertFalse(
             submit_button.get_properties()['enabled']
@@ -290,7 +303,7 @@
             submit_button.get_properties()['enabled']
         )
 
-        self.system_settings.main_view.scroll_to_and_click(submit_button)
+        self.main_view.scroll_to_and_click(submit_button)
 
         self.assertTrue(sim_lock_control.checked)
 
@@ -300,27 +313,31 @@
 
     def test_sim_pin_lock_control_unlock_fail(self):
         self._go_to_sim_lock()
-        sim_lock_control = self.system_settings.main_view.select_single(
-            objectName='simPinSwitch')
+        sim_lock_control = self.main_view.select_single(
+            objectName='simPinSwitch'
+        )
 
         self.assertTrue(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
         )
         self.assertTrue(sim_lock_control.checked)
 
-        self.system_settings.main_view.scroll_to_and_click(sim_lock_control)
+        self.main_view.scroll_to_and_click(sim_lock_control)
 
-        lock_dialog = self.system_settings.main_view.select_single(
-            objectName='lockDialogComponent')
+        lock_dialog = self.main_view.select_single(
+            objectName='lockDialogComponent'
+        )
         self.assertEqual(
             lock_dialog.title,
             _("Enter SIM PIN")
         )
 
-        prev_input = self.system_settings.main_view.select_single(
-            objectName='prevInput')
-        submit_button = self.system_settings.main_view.select_single(
-            objectName='lockButton')
+        prev_input = self.main_view.select_single(
+            objectName='prevInput'
+        )
+        submit_button = self.main_view.select_single(
+            objectName='lockButton'
+        )
 
         self.assertEqual(
             submit_button.text,
@@ -330,14 +347,14 @@
         self.assertFalse(
             submit_button.get_properties()['enabled']
         )
-        self.system_settings.main_view.scroll_to_and_click(prev_input)
+        self.main_view.scroll_to_and_click(prev_input)
         self.keyboard.type("1234")
 
         self.assertTrue(
             submit_button.get_properties()['enabled']
         )
 
-        self.system_settings.main_view.scroll_to_and_click(submit_button)
+        self.main_view.scroll_to_and_click(submit_button)
 
         self.assertTrue(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
@@ -347,26 +364,30 @@
     def test_sim_pin_lock_control_lock_fail(self):
         self.modem_0.Set(SIM_IFACE, 'LockedPins', "")
         self._go_to_sim_lock()
-        sim_lock_control = self.system_settings.main_view.select_single(
-            objectName='simPinSwitch')
+        sim_lock_control = self.main_view.select_single(
+            objectName='simPinSwitch'
+        )
 
         self.assertFalse(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
         )
 
-        self.system_settings.main_view.scroll_to_and_click(sim_lock_control)
+        self.main_view.scroll_to_and_click(sim_lock_control)
 
-        lock_dialog = self.system_settings.main_view.select_single(
-            objectName='lockDialogComponent')
+        lock_dialog = self.main_view.select_single(
+            objectName='lockDialogComponent'
+        )
         self.assertEqual(
             lock_dialog.title,
             _("Enter SIM PIN")
         )
 
-        prev_input = self.system_settings.main_view.select_single(
-            objectName='prevInput')
-        submit_button = self.system_settings.main_view.select_single(
-            objectName='lockButton')
+        prev_input = self.main_view.select_single(
+            objectName='prevInput'
+        )
+        submit_button = self.main_view.select_single(
+            objectName='lockButton'
+        )
 
         self.assertEqual(
             submit_button.text,
@@ -376,14 +397,14 @@
         self.assertFalse(
             submit_button.get_properties()['enabled']
         )
-        self.system_settings.main_view.scroll_to_and_click(prev_input)
+        self.main_view.scroll_to_and_click(prev_input)
         self.keyboard.type("1234")
 
         self.assertTrue(
             submit_button.get_properties()['enabled']
         )
 
-        self.system_settings.main_view.scroll_to_and_click(submit_button)
+        self.main_view.scroll_to_and_click(submit_button)
 
         self.assertFalse(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_sound.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_sound.py	2014-11-13 16:52:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_sound.py	2015-01-08 16:44:36 +0000
@@ -19,19 +19,20 @@
     def test_sound_page(self):
         """ Checks whether Sound page is available """
         self.assertThat(
-            self.system_settings.main_view.sound_page,
+            self.sound_page,
             NotEquals(None)
         )
         self.assertThat(
-            self.system_settings.main_view.sound_page.title,
+            self.sound_page.title,
             Equals(_('Sound'))
         )
 
     def test_silent_mode_sound_switch(self):
         """ Check that silent_mode is present and clickable"""
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="silentMode")
-        self.system_settings.main_view.scroll_to_and_click(snd)
+        snd = self.sound_page.select_single(
+            objectName="silentMode"
+        )
+        self.main_view.scroll_to_and_click(snd)
         sleep(0.2)
         calls = self.dbus_mock_isound.GetCalls()
         self.assertThat(
@@ -45,63 +46,56 @@
 
     def test_call_vibrate_sound_switch(self):
         """ Check that call vibrate is present and clickable"""
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="callVibrate")
-        prev_value = self.obj_test.GetIncomingCallVibrate()
-        self.system_settings.main_view.scroll_to_and_click(snd)
-        sleep(0.2)
-        self.assertNotEqual(
-            self.obj_test.GetIncomingCallVibrate(),
-            prev_value)
-
-    def test_call_vibrate_silent_mode_sound_switch(self):
-        """ Check that call vibrate silent mode is present and clickable"""
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="callVibrateSilentMode")
-        prev_value = self.obj_test.GetIncomingCallVibrateSilentMode()
-        self.system_settings.main_view.scroll_to_and_click(snd)
-        sleep(0.2)
-        self.assertNotEqual(
-            self.obj_test.GetIncomingCallVibrateSilentMode(),
+        snd = self.sound_page.select_single(
+            objectName="callVibrate"
+        )
+        prev_value = self.obj_snd.GetIncomingCallVibrate()
+        self.main_view.scroll_to_and_click(snd)
+        sleep(0.2)
+        self.assertNotEqual(
+            self.obj_snd.GetIncomingCallVibrate(),
             prev_value)
 
     def test_message_vibrate_sound_switch(self):
         """ Check that message vibrate is present and clickable"""
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="messageVibrate")
-        prev_value = self.obj_test.GetIncomingMessageVibrate()
-        self.system_settings.main_view.scroll_to_and_click(snd)
+        snd = self.sound_page.select_single(
+            objectName="messageVibrate"
+        )
+        prev_value = self.obj_snd.GetIncomingMessageVibrate()
+        self.main_view.scroll_to_and_click(snd)
         sleep(0.2)
         self.assertNotEqual(
-            self.obj_test.GetIncomingMessageVibrate(),
+            self.obj_snd.GetIncomingMessageVibrate(),
             prev_value)
 
     def test_message_vibrate_silent_mode_sound_switch(self):
         """ Check that message vibrate silent mode is present and clickable"""
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="messageVibrateSilentMode")
-        prev_value = self.obj_test.GetIncomingMessageVibrateSilentMode()
-        self.system_settings.main_view.scroll_to_and_click(snd)
+        snd = self.sound_page.select_single(
+            objectName="messageVibrateSilentMode"
+        )
+        prev_value = self.obj_snd.GetIncomingMessageVibrateSilentMode()
+        self.main_view.scroll_to_and_click(snd)
         sleep(0.2)
         self.assertNotEqual(
-            self.obj_test.GetIncomingMessageVibrateSilentMode(),
+            self.obj_snd.GetIncomingMessageVibrateSilentMode(),
             prev_value)
 
     def test_keyboard_sound_switch(self):
         """ Check that keyboard sound is present and clickable"""
-        kbd_snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="keyboardSoundSwitch")
+        kbd_snd = self.sound_page.select_single(
+            objectName="keyboardSoundSwitch"
+        )
         current_value = kbd_snd.get_properties()["checked"]
-        self.system_settings.main_view.scroll_to_and_click(kbd_snd)
+        self.main_view.scroll_to_and_click(kbd_snd)
         self.assertThat(
             kbd_snd.get_properties()["checked"], NotEquals(current_value))
 
     def test_dialpad_sounds_switch(self):
-        """ Check that dialpad_sounds is present and clickable"""
-        snd = self.system_settings.main_view.sound_page.select_single(
-            objectName="dialpadSounds")
-        prev_value = self.obj_test.GetDialpadSoundsEnabled()
-        self.system_settings.main_view.scroll_to_and_click(snd)
+        snd = self.sound_page.select_single(
+            objectName="dialpadSounds"
+        )
+        prev_value = self.obj_snd.GetDialpadSoundsEnabled()
+        self.main_view.scroll_to_and_click(snd)
         self.assertThat(
-            lambda: self.obj_test.GetDialpadSoundsEnabled(),
+            lambda: self.obj_snd.GetDialpadSoundsEnabled(),
             Eventually(NotEquals(prev_value)))
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-10-21 15:26:59 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-01-08 16:44:36 +0000
@@ -32,7 +32,7 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
-            scroll_to_and_click=self.system_settings.main_view
+            scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
         # allow backend to set up listeners
@@ -59,7 +59,7 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
-            scroll_to_and_click=self.system_settings.main_view
+            scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
         # allow backend to set up listeners
@@ -88,7 +88,7 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
-            scroll_to_and_click=self.system_settings.main_view
+            scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
         # allow backend to set up listeners
@@ -116,7 +116,7 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
-            scroll_to_and_click=self.system_settings.main_view
+            scroll_to_and_click=self.main_view
             .scroll_to_and_click)
         # allow backend to set up listeners
         sleep(0.3)
@@ -143,7 +143,7 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'foo',
-            scroll_to_and_click=self.system_settings.main_view
+            scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
         # allow backend to set up listeners
@@ -173,7 +173,7 @@
     The NetworkManager dbusmock template does not currently support deletion
     of connections."""
     def test_remove_previous_network(self):
-        click_method = self.system_settings.main_view.scroll_to_and_click
+        click_method = self.main_view.scroll_to_and_click
         previous_networks = [{
             'ssid': 'Series of Tubes',
             'connection_name': 'conn_0'
@@ -190,7 +190,7 @@
         self.wifi_page.remove_previous_network(
             previous_networks[0]['ssid'], scroll_to_and_click=click_method)
 
-        self.system_settings.main_view.go_back()
+        self.main_view.go_back()
 
         # wait for ui to update
         sleep(2)