Reorganize android tests for Async