refactor tests
Merge pull request #31 from MiCHiLU/refactor-tests

refactor tests