Refactored DataFixtures to rely on database instead of references