Fixed code review comments for test files for sprint36
Code refactory for sprint36

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

Code refactory for sprint36
affinity group should not be undefined
Merge pull request #2 from acharyarajiv/sprint36

affinity group should not be undefined
Merge pull request #28 from babumuralidharan/sprint36

PR review comments updated