fix tests for PR #4766