Fix a couple more ios tests

@bug W-2102360@

@rev rjayaramappa@
Merging origin/goliver/master-pending-ios-tests into master