[1.6.x] Fixed a couple form/formset deprecation warnings in tests.

Backport of a521d10322 from master.