Refactor tests
Merge pull request #126 from theponti/develop

Refactor tests