Improve a comment
Remove uses of compose(s) in tests, and change how composition is handled

The driver now also supports nested lists of setup functions