Tests for #202 go with the metamodel tests
Tests for #203
Fix #222 - but to work needs hand-written js