test fixes
(cherry picked from commit e6c36575a074b9a44c882d344632cb0abfc2974d)