Cosmetic test tweaks.