aded tests related to issue #101, issue #128
fixed issue #132 tests added, issue #128
Merge pull request #134 from YaroslavLitvinov/dev

issues 132, 101