@@ -69,6 +69,6 @@ Exercises:
 .. toctree::
     :maxdepth: 1
 
-    ../exercises/oo_intro.rst
+    ../exercises/oo_intro/oo_intro.rst
     ../exercises/html_renderer.rst
     ../exercises/html_renderer_tutorial.rst
@@ -1,8 +1,8 @@
 .. _oo_intro:
 
-########################
+#######################
 OO Intro - Report Class
-########################
+#######################
 
 This assignment uses Object Oriented Programming to design a class that can be used to manage data reporting.
 
@@ -14,18 +14,28 @@ We will explore here how one can utilize OO to improve and enhance reporting cap
 Procedure
 =========
 
-You will use :download:`report.py` and :download:`test_report.py` file as a starting point for your code.
+Use the :download:`report.py` and :download:`test_report.py` files as a starting point for your code.
 
-You will notice that ``Report`` class will have attributes and methods defined for you, including input parameters (and their types) as well as expected output.
-You will need to fill out the code for each defined method and docstrings containing additional information on what is expected.
+Notice that the ``Report`` class has attributes and methods defined for you, including input parameters as well as expected output.
+
+You will need to fill out the code and docstrings for each defined method containing additional information on what is expected.
+
+There is also some example code in the ``__main__`` block, to see how it's used.
+
+Use TDD: write a test for each method before you add that functionality. There is a test file started for you -- it has one (failing) test for one of the methods.
+
+The Row class
+-------------
+
+The ``Report`` class uses another class, ``Row``, that is fully defined (and tested) for you. This class represents a single row in your report, and the report class will hold a list of the row instances.
+
+There are big advantages to using a class like ``Row`` rather than a simple dictionary. This design creates a clear contract about what is part of a row, whereas with a dictionary you can put anything in it, so it is harder to catch when a key is misspelled or missing.
 
-The ``Report`` class uses another class that is fully defined for you,
-the ``Row`` class. This class represents a single row in your report, and the report class will hold a list of the row instances.
-There are big advantages to using a class like ``Row`` in contrast to a simple dictionary, this design creates a clear contract on what's expected to be as part of a row, where with a dictionary it is easy to misspell or miss a key.
 A class like ``Row`` is often called a "data class" (since it only holds "data" and doesn't actually have any logic to it).
 
-This is such a popular pattern that python introduced ``dataclasses`` in
-`version 3.7 <https://www.python.org/dev/peps/pep-0557>`_ to make this even simpler. You do not use them in this assignment but you should know that they exist and why.
+This is such a popular pattern that Python introduced ``dataclasses`` in
+`version 3.7 <https://www.python.org/dev/peps/pep-0557>`_ to make this even simpler.
+You do not use them in this assignment but you should know that they exist and why.
 
 You can read more about ``dataclasses`` in the Python docs here:
 
 
@@ -15,7 +15,7 @@ class Row:
     with ID, first name, last name and state attributes
     """
     def __init__(self, fname, lname, state):
-        self.row_id = str(uuid4())  # randomly generated unique ID
+        self.id = str(uuid4())  # randomly generated unique ID
         self.fname = fname
         self.lname = lname
         self.state = state
@@ -30,11 +30,11 @@ def __init__(self, limit: int):
         self.rows = []
 
     def add_row(self, row):
-        """Add a row object to the list"""
+        """Add a row object to the report"""
         pass
 
     def remove_row(self, row_id):
-        """Remove a row object by the row ID"""
+        """Remove a row object by the row's ID"""
         pass
 
     def size(self):
 
@@ -1,3 +1,50 @@
 """
 test code for the Report class(es)
-"""
+"""
+
+from report import Row, Report
+
+
+def populate_report(report):
+    """
+    utility function to populate a Report with some data
+
+    :param report: the report object to populate
+
+    The Report will be populated in place
+    """
+    report.add_row(Row("Natasha", "Smith", "WA"))
+    report.add_row(Row("Devin", "Lei", "WA"))
+    report.add_row(Row("Bob", "Li", "CA"))
+    report.add_row(Row("Tracy", "Jones", "OR"))
+    report.add_row(Row("Johnny", "Jakes", "WA"))
+    report.add_row(Row("Derek", "Wright", "WA"))
+    report.add_row(Row("Jordan", "Cooper", "WA"))
+    report.add_row(Row("Mike", "Wong", "WA"))
+
+
+def test_row_init():
+    """You can initialize a Row, and it stores the attributes"""
+
+    row1 = Row("Joe", "Camel", "WA")
+
+    assert row1.fname == "Joe"
+    assert row1.lname == "Camel"
+    assert row1.state == "WA"
+
+
+def test_row_id_unique():
+    """ two Rows should have unique IDs """
+    row1 = Row("Joe", "Camel", "WA")
+    row2 = Row("Bob", "Camel", "WA")
+
+    assert row1.id != row2.id
+
+
+def test_report_length():
+    report = Report(4)
+    populate_report(report)
+
+    # the test data has 8 rows
+    assert report.size() == 8
+