Complete adaptation of old templating tests

A few still fail, with comments explaining why.