Added hamcrest, for Toby's test that I'm about to cherry-pick