Passing tests by changing the helper to include location and latlong