Rename tests too