Fixed android tests