Refactor tests
Merge pull request #37 from edmoz/add-refactor-tests

Refactor tests