Improving test coverage of recent model layer changes.