More work on test class, and add hamcrest lib