Update fixtures
Fix some model validation bugs