Make test more reliable