Make the tests more reliable