add a few model tests, remove a few traits
unique things