Update tests that involve <frame> in <template> to match specified behaviour.