Progress on Android tests