Yet more tests and fixes
Large quantity of tests and fixes, approaching 100% model coverage