PRD-4921 - more test fixes