Tests refactoring
Merge pull request #16 from piotrglazar/feature/travis-test-fix

Tests refactoring