Fixing tests after major iOS commit
Merge pull request #316 from dagolap/fix/fix-tests-and-android-after-major-ios

Fixing tests after major iOS commit