Models and fixtures refined