Resolve failing tests at end of Chapter 5