Added GMaps and tests