fixed unreliable tests