Added mockery require-dev dependency
Added remaining functionality