Android test cleanup