refactor models
Fix tests + fixtures