Merge pull request #27 from incuna/refactor-tests

Refactor tests
Merge branch 'master' into even-more-tests