fixed more unstable tests