fixes test for escaping in keys
update to latest template