cleanup - renamed tests