Refactoring to use Mockito in tests. Streamlined Complainer process to
flatten the arrow-code that had existed.