@@ -1,3 +1,10 @@
+{# Usage: {%- import "generator_macros.j2" as macros -%} #}
+{# {{ macros.canonical_ref(version) }} #}
+
+{% macro canonical_ref(version) -%}
+# Tests adapted from `problem-specifications//canonical-data.json` @ v{{ version }}
+{%- endmacro %}
+
 {% macro utility() -%}# Utility functions
     def setUp(self):
         try:
 
@@ -0,0 +1,29 @@
+{%- import "generator_macros.j2" as macros -%}
+{%- macro test_call(case) %}
+            {{ case["property"] | to_snake }}(
+                {% for arg in case["input"].values() -%}
+                "{{ arg }}",
+                {% endfor %}
+            )
+{% endmacro -%}
+import unittest
+
+from {{ exercise | to_snake }} import {% for prop in properties -%}
+    {{ prop | to_snake }}{% if not loop.last %}, {% endif -%}
+{% endfor %}
+
+{{ macros.canonical_ref(version) }}
+
+class {{ exercise | camel_case }}Test(unittest.TestCase):
+    {# All test cases in this exercise are nested, so use two for loops -#}
+    {% for case in cases -%}{% for case in case["cases"] -%}
+    def test_{{ case["description"] | to_snake }}(self):
+        self.assertIs(
+            {{- test_call(case) }},
+            {{ case["expected"] }}
+        )
+    {% endfor %}{% endfor %}
+
+
+if __name__ == '__main__':
+    unittest.main()
@@ -2,11 +2,10 @@
 
 from isogram import is_isogram
 
-
 # Tests adapted from `problem-specifications//canonical-data.json` @ v1.7.0
 
-class IsogramTest(unittest.TestCase):
 
+class IsogramTest(unittest.TestCase):
     def test_empty_string(self):
         self.assertIs(is_isogram(""), True)
 
@@ -16,7 +15,7 @@ def test_isogram_with_only_lower_case_characters(self):
     def test_word_with_one_duplicated_character(self):
         self.assertIs(is_isogram("eleven"), False)
 
-    def test_word_with_one_duplicated_character_from_end_of_alphabet(self):
+    def test_word_with_one_duplicated_character_from_the_end_of_the_alphabet(self):
         self.assertIs(is_isogram("zzyzx"), False)
 
     def test_longest_reported_english_isogram(self):
@@ -25,13 +24,13 @@ def test_longest_reported_english_isogram(self):
     def test_word_with_duplicated_character_in_mixed_case(self):
         self.assertIs(is_isogram("Alphabet"), False)
 
-    def test_word_with_duplicated_letter_in_mixed_case_lowercase_first(self):
+    def test_word_with_duplicated_character_in_mixed_case_lowercase_first(self):
         self.assertIs(is_isogram("alphAbet"), False)
 
     def test_hypothetical_isogrammic_word_with_hyphen(self):
         self.assertIs(is_isogram("thumbscrew-japingly"), True)
 
-    def test_hypothetical_word_with_duplicate_character_following_hyphen(self):
+    def test_hypothetical_word_with_duplicated_character_following_hyphen(self):
         self.assertIs(is_isogram("thumbscrew-jappingly"), False)
 
     def test_isogram_with_duplicated_hyphen(self):
@@ -46,11 +45,6 @@ def test_duplicated_character_in_the_middle(self):
     def test_same_first_and_last_characters(self):
         self.assertIs(is_isogram("angola"), False)
 
-    # Additional tests for this track
-
-    def test_isogram_with_duplicated_letter_and_nonletter_character(self):
-        self.assertIs(is_isogram("Aleph Bot Chap"), False)
-
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()