progress towards making the old templating tests pass