Small improvements...
Merge pull request #17 from SlavaRa/tests-refactor

Small improvements...