Finished chapter 11 with test changes