Make concelable tests more reliable