refs #7156 - test updates for model changes