tests cleanup
Merge pull request #4 from ignatov/tests-cleanup

Tests cleanup