Test improvements: more factories, slightly better coverage in models
More test trimming using Factories