PRD-4626 test case and fix