Added Android tests. But Tests need improvements