Refactor tests #4583
Merge pull request #94 from priyankarani/feature/task-4583

Refactor tests #4583