Removed  template, fixed tests, corrected templates.