Bug fix for #21
Serialize Django models with django serializers
Some test suite updates