Make test a little more reliable