Revert "Adjust test generator to make tests pass"

This reverts commit e5310f1147694992d1eb48a037261f805955294c.
Merge branch 'master' of https://github.com/marangonico/django-oscar