fixing ios tests
Merge pull request #2631 from sebv/master

Fixing remaining ios tests
ci android branch for build #4510.3