down to two errors
Added some ifs and few skips to glide over the problematic areas
Merge pull request #12 from jamiecurle/patch-for-django-1.4.10

Regression bugs popped. This PR patches the tests for 1.4.10