fixed some unstable tests