PRD-4692: Test case fixes