Code refractoring of smoke tests