Test fix-up.