updated models and tests
update ideas