Attempt to make tests more stable