Tests for base models
Various test refactoring for models and fields
Put a missing method on models
Fix field labels on tests