Upgrading Junit + Hamcrest