Try to make the tests more reliable...