fix some failing android tests