refactoring test
Merge pull request #5 from svetzal/master

Suggestions for refactoring tests