Removed model_id from Model objects, which in any case in managed by session.  But tests aren't passing; need to investigate further.