:lipstick: Refactor test code
Merge pull request #8 from Aldenard/refactor-test

:lipstick: Refactor test code