refactor model
update test/fixtures