Complete adaptation of old templating tests

A few still fail, with comments explaining why.
minor
Merge remote-tracking branch 'origin/shark' into shark-render2