Code refractoring of FTs and smoke tests