Issue #3331646: Fix test cases

Stephen Mustgrave requested to merge issue/security_review-3331646:3331646-fix-test-cases into 2.0.x Jan 06, 2023