Add templates for specifying splitting via kvp in addition to map/pair (and tests)