More test stability fixes.