Fixing tests and cleaning up before Chapter 9.