Try to make the test more robust