started to fix android tests