fixed some android tests and configurations