Make test more robust