move and rename tests