Rename some tests; remove the unnecessary.