Refactore the tests
Merge pull request #1 from Appsdeck/refacto_test

Refactore the tests