Android tests

Cleaning up more tests.