Get rid of most mocks.
Improved Hazel clustering