Fix to previous commit
Added Mockery to Travis config
Merge branch 'embedded-triggers'