updated django models
updated test fixtures