Added hamcrest for JUnit testing