percent of test coverage increased, some unused functions removed
Merge pull request #129 from YaroslavLitvinov/test-fix

percent of test coverage increased, some unused functions removed