Adds Template tags for generating default xml stuff. New tests