improved releability of some tests