Updated tests based on Chapter 5 exercises