[#879] Further test fix-ups