Make fixtures code more clean & re-usable
Remove unused states for some models