renaming fixture and adding to tests
refactor models