Small refactoring...
Merge pull request #2 from SlavaRa/tests-refactor

Small refactoring...