Add fixtures
Refactor