Android tests

Cleaning up more tests. (Ticket #151.)