Consolidate test models and fixtures