[#8455] misc fixes to tests from pytest conversion
5 files changed