fixing AndroidTestApplication after merge