added new lines at EOF
removed redudant part of code
changed data provider name
initial work on additional unit test
Merge branch 'code-review-round-1' into DAR-136