Refactor tests
Refactor tests
Merge pull request #1 from orofarne/master

Refactor test suite