Making the command array into a command matrix

(so we can more easily inject the setup and teardown tasks as well as
handle container searching before tagging