Refactor tests
Merge pull request #33 from jhnns/refactor/tests

Refactor tests