change junit dependency to 4.10, and add hamcrest