Working implementation for issue-1216
issue 1216: added functional test file
Revert "issue 1216: added functional test file"

This reverts commit 6b69db132c6b50aa3885c7556044694668eb75de.
isue-1216: added functional tests
Revert "isue-1216: added functional tests"

This reverts commit ac1f4420d05eb2927117bb9332a4c29da34d6201.
issue-1216: added functional tests
issue-1216: improved code quality
Fixed merge conflicts.
Deleted 'Head >>>' comment from previous merge conflict.
Style Formatting.
Style Formatting.
Style Formatting.
Merge pull request #1506 from ealonas/issue-1227

Issue 1227 - Conflicts Solved. Fixes #1216.