(refactor) Modifying tests
Merge pull request #86 from phoenix16t/refactor/test

(refactor) Modifying tests