updated templates for django 1.5. added tests.