Attempt to make tests more reliable