Chapter 8 - updated tests