Updated Android tests and made a few minor fixes.