[#eng-3897] more test fixes