added mockery to dev requirements. added some unit tests. exciting.
Merge branch 'develop'