Using new test layout. Shall be compatible with Django-1.6 and 1.5
Fixed typo
To be added to the docs