Add Mockery and update credits
Refactor the helpers service and add tests for it