Remove the dependency on hamcrest