Removed mockito to avoid OOM during tests.

Fixed fallback with hystrix to retain counts

Rolled Hystrix version back to 1.3