Fixed code review comments for test files for sprint36