[Android][URBNG-278] Bug fixes + tests. All ready

specific task infromations -> request with that soon, tonight I think)