fixed tests
Merge pull request #2615 from sebv/master

Started to fix ios tests
ci android branch for build #4464.3