improved stability of some tests