Last change broke some tests - now all tests in SalesforceSDKCore passing