add leaflet to test data, bug fixs