Fixing unreliable tests (2002449)