Fix junit/hamcrest dependency pain.