Chapter 15, adding more tests