Unit tests fix
Merge pull request #131 from herbatnik/testFix

[Android] Unit tests fix