Making some tests more stable