Code refactory for sprint36

Fixed code review comments for test files for sprint36
Merge pull request #1 from acharyarajiv/sprint36

Code refactory for sprint36