Rename some tests to match the others