Chapter 16 - Converted java main classes to junit/hamcrest tests