Change existing JUnit assets to hamcrest JUnit assets