Chapter 7 (missing some unit test code)

The unit tests themselves are there, but the rest is not really set up.