fixed two tests, a few templates.