Updates to use org.hamcrest.core version 1.3+