Added two-step variants of surface clear tests