Added new test and refactored
Merge pull request #1021 from a-chumagin/master

Added new test and refactored