Refactoring to use Mockito in tests. Streamlined Complainer process to
flatten the arrow-code that had existed.
Merge pull request #33 from Gonthim/master

Refactoring to use Mockito in tests.