Some more test tuning.