Chapter 5 Exercises - further refactor testing.