[LFC] Unreviewed test gardening.