Fixing some fragile tests