tests and template changes. mostly template changes