A few more And tests
Refactor some of the combining schema generators so that they all work more or less the same way

don't use recursive loop functions in one and array pop in another