Update tests with common model changes