Fix some hamcrest imports.