Merge "Increasing test coverage for vid.mso.model"