SI-7029 - Make test more robust