started using mockery instead of native phpunit mocking.
Some code formatting.