More tests, fixed waterfall to pass multiple result args from upstream steps to downstream steps