Test cleanup
For #9-semweb-model
Simpler unit tests
For #9-semweb-model