Fix tests, one bug.  Adopt a more Django-ish testing style.