Refactored GoogleMapsProvider and updated tests - fix #232