Make the test more robust