refactor
Merge pull request #6 from FenrirUnbound/refactor-tests

refactor