#20 Initial support for Android. Various test improvements.