Fix scope of Hamcrest