Android test fix