Code refactory for sprint36

Fixed code review comments for test files for sprint36