Clean up tests and finish chapter 8