Small refactoring...
Merge pull request #18 from SlavaRa/tests-CodeRefactor

Small refactoring...