Make fixtures code more clean & re-usable
Remove unused states for some models
Merge pull request #1517 from stloyd/feature/fixtures

Make fixtures code more clean & re-usable