Write tests for new Android code 

Write tests for the new functionality and get a high code coverage with these tests