Add more testing and clean up earlier tests. Complete Exercises for Chapter 5.