Fixed tests and flake8 issues #2819

Review ID: 498002
Merge pull request #23 from prakashpp/feature/task-2819

Feature/task 2819