fixed more ios tests
Merge pull request #2617 from sebv/master

Fixed more ios tests
ci android branch for build #4477.3