diff --git a/core/tests/tests_forms.py b/core/tests/tests_forms.py
index b27f7f4c..86faa8bb 100644
--- a/core/tests/tests_forms.py
+++ b/core/tests/tests_forms.py
@@ -463,6 +463,11 @@ class TummyTimeFormsTestCase(FormsTestCaseBase):
 
 
 class TimerFormsTestCase(FormsTestCaseBase):
+    @classmethod
+    def setUpClass(cls):
+        super(TimerFormsTestCase, cls).setUpClass()
+        cls.timer = models.Timer.objects.create(user=cls.user)
+
     def test_add(self):
         params = {
             'child': self.child.id,
@@ -475,19 +480,29 @@ class TimerFormsTestCase(FormsTestCaseBase):
         self.assertContains(page, params['child'])
 
     def test_edit(self):
-        timer = models.Timer.objects.create(user=self.user)
-
-        start_time = timer.start - timezone.timedelta(hours=1)
+        start_time = self.timer.start - timezone.timedelta(hours=1)
         params = {
             'name': 'New Timer Name',
             'start': self.localtime_string(start_time)
         }
-        page = self.c.post('/timer/{}/edit/'.format(timer.id), params,
+        page = self.c.post('/timer/{}/edit/'.format(self.timer.id), params,
                            follow=True)
         self.assertEqual(page.status_code, 200)
         self.assertContains(page, params['name'])
-        timer.refresh_from_db()
-        self.assertEqual(self.localtime_string(timer.start), params['start'])
+        self.timer.refresh_from_db()
+        self.assertEqual(
+            self.localtime_string(self.timer.start), params['start'])
+
+    def test_edit_stopped(self):
+        self.timer.stop()
+        params = {
+            'name': 'Edit stopped timer',
+            'start': self.localtime_string(self.timer.start),
+            'end': self.localtime_string(self.timer.end),
+        }
+        page = self.c.post('/timer/{}/edit/'.format(self.timer.id), params,
+                           follow=True)
+        self.assertEqual(page.status_code, 200)
 
 
 class ValidationsTestCase(FormsTestCaseBase):
diff --git a/core/tests/tests_models.py b/core/tests/tests_models.py
index ec0d1918..8d0190c2 100644
--- a/core/tests/tests_models.py
+++ b/core/tests/tests_models.py
@@ -189,6 +189,19 @@ class TimerTestCase(TestCase):
         self.assertEqual(
             str(self.unnamed), 'Timer #{}'.format(self.unnamed.id))
 
+    def test_timer_title_with_child(self):
+        self.assertEqual(self.named.title_with_child, str(self.named))
+
+        models.Child.objects.create(
+            first_name='Child',
+            last_name='Two',
+            birth_date=timezone.localdate()
+        )
+        self.assertEqual(
+            self.named.title_with_child,
+            '{} ({})'.format(str(self.named), str(self.named.child))
+        )
+
     def test_timer_restart(self):
         self.named.restart()
         self.assertIsNone(self.named.end)