Change feature to markerName, add unit test