diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 20a94799c..56c0d970a 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -43,46 +43,45 @@ class TestHooksOnLaunch(TestCase):
         self.t.activate_hooks()
 
     def test_onlaunch_builtin_good(self):
-        """Verify a well-behaved, successful, on-launch hook."""
+        """on-launch-good - a well-behaved, successful, on-launch hook."""
         hookname = 'on-launch-good'
         self.t.hooks.add_default(hookname, log=True)
 
         code, out, err = self.t(("version",))
         self.assertIn("Taskwarrior", out)
-        self.assertIn("FEEDBACK", err)
-
-#        self.t.hooks[hookname].assert_triggered()
-#        self.t.hooks[hookname].assert_triggered_count(1)
-#        self.t.hooks[hookname].assert_exitcode(0)
-
-#        logs = self.t.hooks[hookname].get_logs()
-#        self.assertEqual(len(logs["calls"]), 1)
-#        self.assertEqual(logs["output"]["msgs"][0], "FEEDBACK")
-#        self.assertEqual(logs["output"]["json"][0]["description"], "This is an example modify hook")
+        self.t.hooks[hookname].assertTriggered()
+        self.t.hooks[hookname].assertTriggeredCount(1)
+        self.t.hooks[hookname].assertExitcode(0)
+        logs = self.t.hooks[hookname].get_logs()
+        self.assertEqual(self.t.hooks[hookname].get_logs()["output"]["msgs"][0], "FEEDBACK")
 
     def test_onlaunch_builtin_bad(self):
-        """Verify a well-behaved, failing, on-launch hook."""
+        """on-launch-bad - a well-behaved, failing, on-launch hook."""
         hookname = 'on-launch-bad'
         self.t.hooks.add_default(hookname, log=True)
 
         # Failing hook should prevent processing.
         code, out, err = self.t.runError(("version",))
-        self.assertEqual(4, code, "Hook failure: $? == 4")
         self.assertNotIn("Taskwarrior", out)
-        self.assertIn("FEEDBACK", err)
+        self.t.hooks[hookname].assertTriggered()
+        self.t.hooks[hookname].assertTriggeredCount(1)
+        self.t.hooks[hookname].assertExitcode(1)
+        logs = self.t.hooks[hookname].get_logs()
+        self.assertEqual(self.t.hooks[hookname].get_logs()["output"]["msgs"][0], "FEEDBACK")
 
     def test_onlaunch_builtin_misbehave1(self):
-        """Hook kills itself."""
+        """on-launch-misbehave1 - Hook kills itself."""
         hookname = 'on-launch-misbehave1'
         self.t.hooks.add_default(hookname, log=True)
 
         # Failing hook should prevent processing.
         code, out, err = self.t.runError(("version",))
-        self.assertEqual(4, code, "Hook failure: $? == 4")
-        self.assertNotIn("Taskwarrior", out)
-        self.assertNotIn("FEEDBACK", err)
-
-        # TODO Look for error
+        self.t.hooks[hookname].assertTriggered()
+        self.t.hooks[hookname].assertTriggeredCount(1)
+        self.t.hooks[hookname].assertExitcode(137)
+        self.assertNotIn("Could not get Hook exit status!", err)
+        logs = self.t.hooks[hookname].get_logs()
+        self.assertEqual(self.t.hooks[hookname].get_logs()["output"]["msgs"][0], "FEEDBACK")
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner