Improve fixtures

- better data generation
- better separation between helpers and actual fixtures