few changes to fix the failing tests on prereleaze org
few changes to fix the failing tests on prereleaze org

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