Finish multi-model generator and tests