finish renaming
Update tests