Added more tests for android