Write tests for new Android code 2

Write tests for untested code, to get high code coverage.