Rename some badly named tests.