refactors tests
Merge pull request #20 from folieadrien/fixes-rebasing-mistakes

refactors tests