Modifications related to testing with Android