Complete exercises at end of Chapter 5: make tests more streamlined