Improve coverage for models