updated tests and templates for django1.5 updates