Added more recent hamcrest versions