fixing failed unit tests
vendor & model changes