Fix tests that warre broken by tweakin' dubstep
Rework django command code