Fixed unreliable tests