Make this test more robust