Tests calling Supply.(zip|merge) as class methods

Sadly, the .merge tests still need to be fudged because of
"Cannot call method 'more' on a null object"