Uncomment the unit test on geolocation that currently fails + some minor changes
Uncomment the unit test on geolocation that currently fails + some minor changes