yet more dotstest changes