Even more test failure tweaks.