Fix Mockery
Merge pull request #166 from yguedidi/fix-mockery

Fix Mockery