Minor test cleanups

Very minor test cleanups courtesy of Django 1.6