small refactoring...
Merge pull request #16 from SlavaRa/tests-refactor

small refactoring...