form bugfix
model up
model tests up