Fix up android tests. 4 still failing