Make this test-case more robust