Some further cleanup of the test-first chapter