add Model tests; rework some other tests