New: use Mockery for unit testing
Fix: existing unit tests work again
WIP: additional unit tests