updated templates and tests