[ExtenedModel] Bug fixes and tests