cleaned up some tests
partial implementation of calltemplate with insite still buggy [#3827943]
updated content model with latest changes [#3827943]