Add android implementation tests
Merge branch 'origin/master'
Fix ios tests
Add Android implementation