More test renaming.