Clarify names and improve testing performance.
Clarify names and improve testing performance.

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus