Refactor factories, unit tests
Merge remote-tracking branch 'upstream/master'
Update composer file
Fixed issue with non-ZF2 exceptions
Merge pull request #247 from jerv13/master

Refactor factories, unit tests