split tests, fix init args in ModelReferenceType, prepare for ref list