Fix tests, pull latest from master

This fixes binding the popup when the layer has not yet been added to the map.