Rename tests and add a legacy test.