Readd hamcrest