Fixes unstable tests