Finish multi-model generator with tests