Remove some duplication in test names.