More test failure fixes.