Fixed test cases
Finished Django work