make some tests more robust