Some refactorings to stubbing gmaps calls was added