=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2014-12-27 10:06:06 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-01-08 10:14:59 +0000
@@ -61,12 +61,23 @@
         return calc.wait_select_single('QQuickText',
                                        objectName='result').text.strip()
 
+    def size(self):
+        _retValue = 0
+
+        history = self.app.select_many('QQuickRectangle', objectName='mainItem')
+
+        if (history > 0):
+            _retValue = 1
+
+        return _retValue
+
 
 class MainView(ubuntuuitoolkit.MainView):
     """Calculator MainView Autopilot emulator."""
 
-    BUTTONS = {'clear': 'clearButton', '*': 'multiplyButton',
-               '8': 'eightButton', '9': 'nineButton', '=': 'equalsButton'}
+    BUTTONS = {'clear': 'clearButton', '*': 'multiplyButton', '1': 'oneButton', '2': 'twoButton', 
+               '3': 'threeButton', '4': 'fourButton', '5': 'fiveButton', '6': 'sixButton', 
+               '7': 'sevenButton', '8': 'eightButton', '9': 'nineButton', '=': 'equalsButton'}
 
     def __init__(self, *args):
         super(MainView, self).__init__(*args)
@@ -94,3 +105,15 @@
     def get_result(self):
         return self.wait_select_single('TextField',
                                        objectName='textInputField').displayText
+
+
+
+    """def check_for_equality(self, expression):
+        isEqual = False
+
+        history = self.get_history()
+        if history == expression:
+            isEqual = True
+
+        return isEqual"""
+

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
--- app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2014-12-27 10:06:06 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2015-01-08 10:14:59 +0000
@@ -27,3 +27,18 @@
                         Eventually(Equals('81')))
 
         self.assertTrue(self.app.main_view.get_history().contains('9×9=81'))
+
+
+    def test_multiple_equals(self):
+        self.app.main_view.insert('2*8=')
+        self.assertThat(self.app.main_view.get_result, Eventually(Equals('16')))
+
+        self.assertEqual(1, self.app.main_view.get_history().size())
+        self.assertTrue(self.app.main_view.get_history().contains('2x8=16'))
+
+        self.app.main_view.press('=')
+        self.app.main_view.press('=')
+        self.app.main_view.press('=')
+
+        self.assertEqual(1, self.app.main_view.get_history().size())
+        self.assertTrue(self.app.main_view.get_history().contains('2x8=16'))

