Remove unnecessary Mockery
Merge branch 'master' into unit_testing
Merge branch 'master' into unit_testing
Add Behat tests
Merge unit_testing branch