Added geotags and tests