Add correct feature inside DeploymentAgentTest.
Add missing dependency in ResolverTest.
Merge tests and remove redundant tests were it makes sense.
Add a timeout to GeoUtils to prevent waiting forever if something goes wrong.