corrected fixtures
Merge branch 'master' into PIM-2602_abstract_models