Updated Android Test Cases