DrawToolTests improved stability