[TASK] Update fixtures
[TASK] Update tests
[TASK] Implement model data validation