Remove explicit dependency on hamcrest