Optional test clean up. Differs from the book but I really prefer this.